+<<<<<<< HEAD
+*.[oa]
+*~
+*.swp
+*.[eo][0-9][0-9][0-9][0-9]*
+=======
# ignore compiled stuff
*.[oa]
*~
-# ifnore build dir
+# ignore build dir
build/
+# ignored dirs form adasko
+gradcheck/
+mapcheck/
+run/
+sympcheck/
+
+>>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1