X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;fp=.gitignore;h=abb36400389eaae108e551739f6ec0c198a094dd;hb=478f5fd9e95bd5665ab58ee691f517d7dab379b3;hp=918a7874ceef416dfd8c987068e9fdd2e2733918;hpb=fd1901c40611f2f95c5c488b9ebc6a291b927d25;p=unres.git

diff --git a/.gitignore b/.gitignore
index 918a787..abb3640 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # ignore compiled stuff
 *.[oa]
 
@@ -8,4 +9,11 @@
 
 # ifnore build dir
 build/
+=======
+~.[ao]
+gradcheck/
+mapcheck/
+run/
+sympcheck/
+>>>>>>> adasko