Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel

[unres.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d5615a4..4c3f4f2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,24 @@
-~.[ao]
+<<<<<<< HEAD
+*.[oa] 
+*~
+*.swp
+*.[eo][0-9][0-9][0-9][0-9]*
+=======
+# ignore compiled stuff
+*.[oa]
+
+# ignore texteditors
+*.swp
+*~
+
+
+# ignore build dir
+build/
+
+# ignored dirs form adasko
 gradcheck/
 mapcheck/
 run/
 sympcheck/
 
+>>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1