Merge branch 'adasko' into devel

[unres.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d5615a4..abb3640 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,19 @@
+<<<<<<< HEAD
+# ignore compiled stuff
+*.[oa]
+
+# ignore texteditors
+*.swp
+*~
+
+
+# ifnore build dir
+build/
+=======
 ~.[ao]
 gradcheck/
 mapcheck/
 run/
 sympcheck/
+>>>>>>> adasko