Merge branch 'adasko' into devel

[unres.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 918a787..abb3640 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # ignore compiled stuff
 *.[oa]
 
@@ -8,4 +9,11 @@
 
 # ifnore build dir
 build/
+=======
+~.[ao]
+gradcheck/
+mapcheck/
+run/
+sympcheck/
+>>>>>>> adasko