Fix merge conflict in .gitignore
This commit is contained in:
parent
02fae90b69
commit
75aaaf922f
2 changed files with 5 additions and 3 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -3,6 +3,7 @@
|
|||
*.so
|
||||
csto
|
||||
doc/
|
||||
include/
|
||||
test.lua
|
||||
|
||||
lua
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue