diff options
Diffstat (limited to '')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -1,5 +1,3 @@ -<<<<<<< HEAD - # Ignore build generated files build ======= @@ -23,4 +21,3 @@ build *.app *.png ->>>>>>> edd9e6670a145e3f41f34c4c6c1cfee44f61a2c7 |