1
0
mirror of https://github.com/beego/bee.git synced 2025-06-11 03:10:40 +00:00

Fixed merge conflict

This commit is contained in:
Faissal Elamraoui
2016-07-28 14:19:42 +02:00
parent 8eb3d9d392
commit 24955fb044
2 changed files with 20 additions and 18 deletions

1
.gitignore vendored
View File

@ -6,6 +6,7 @@
# Folders
_obj
_test
.idea
# Architecture specific extensions/prefixes
*.[568vq]