X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=8a8f64c05520bdadc40a9c2f0687b14381507f7a;hb=383df3a859eee229a6b9f7949239c6a92c7e6063;hp=abb36400389eaae108e551739f6ec0c198a094dd;hpb=478f5fd9e95bd5665ab58ee691f517d7dab379b3;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