Fix merge conflict in .gitignore

This commit is contained in:
Jeremy Baxter 2023-07-24 13:24:06 +12:00
parent 02fae90b69
commit 75aaaf922f
2 changed files with 5 additions and 3 deletions

1
.gitignore vendored
View file

@ -3,6 +3,7 @@
*.so
csto
doc/
include/
test.lua
lua