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