diff options
| author | Victor Häggqvist <[email protected]> | 2014-06-12 00:22:41 +0200 |
|---|---|---|
| committer | Victor Häggqvist <[email protected]> | 2014-06-12 00:22:41 +0200 |
| commit | 912ea5de0a52df31d4225aa4096b35685a018b80 (patch) | |
| tree | f7d8abeb4a6b564829fdd8edea3c7c31b6adf589 /.gitignore | |
| parent | 4edc9e643ca995b0e428e2c224d47c406dd7c85c (diff) | |
me stupid
Diffstat (limited to '.gitignore')
| -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 |