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

[unres.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8a8f64c..4c3f4f2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
+<<<<<<< HEAD
+*.[oa] 
+*~
+*.swp
+*.[eo][0-9][0-9][0-9][0-9]*
+=======
 # ignore compiled stuff
 *.[oa]
 
@@ -15,3 +21,4 @@ mapcheck/
 run/
 sympcheck/
 
+>>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1