diff options
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,8 @@ +<<<<<<< HEAD + +# Ignore build generated files +build +======= # Object files *.o *.ko @@ -16,3 +21,4 @@ *.exe *.out *.app +>>>>>>> edd9e6670a145e3f41f34c4c6c1cfee44f61a2c7 |