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

diff --git a/.gitignore b/.gitignore
index 45bb905..4c3f4f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,24 @@
+<<<<<<< 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