X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=4c3f4f264ccb91d85ada8e01dbe24581ce985a01;hb=52187c9365594597457799445140ea830f1141a3;hp=8a8f64c05520bdadc40a9c2f0687b14381507f7a;hpb=aebadf9023e437f497f92dfcf2303c16f60917c1;p=unres.git

diff --git a/.gitignore b/.gitignore
index 8a8f64c..4c3f4f2 100644
--- 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