diff options
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,10 +1,13 @@ build/ docs/build/ -main.cpp libmaple.layout tags TAGS *~ *.swp docs/doxygen/ +<<<<<<< Updated upstream arm +======= +notes/ +>>>>>>> Stashed changes |