X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=.gitignore;h=8a8f64c05520bdadc40a9c2f0687b14381507f7a;hb=f28b6049844f723c108dc6eb421bd852887950ba;hp=abb36400389eaae108e551739f6ec0c198a094dd;hpb=ac32b72e6bb48e2caacd7fb88a270089889b2ef5;p=unres.git

diff --git a/.gitignore b/.gitignore
index abb3640..8a8f64c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # ignore compiled stuff
 *.[oa]
 
@@ -7,13 +6,12 @@
 *~
 
 
-# ifnore build dir
+# ignore build dir
 build/
-=======
-~.[ao]
+
+# ignored dirs form adasko
 gradcheck/
 mapcheck/
 run/
 sympcheck/
->>>>>>> adasko