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:
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,6 +6,7 @@
|
||||
# Folders
|
||||
_obj
|
||||
_test
|
||||
.idea
|
||||
|
||||
# Architecture specific extensions/prefixes
|
||||
*.[568vq]
|
||||
|
Reference in New Issue
Block a user