From: Adam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
Date: Mon, 18 Jun 2012 10:35:12 +0000 (-0400)
Subject: unified .gitignore
X-Git-Tag: v.3.2~82
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=383df3a859eee229a6b9f7949239c6a92c7e6063

unified .gitignore
---

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