From 383df3a859eee229a6b9f7949239c6a92c7e6063 Mon Sep 17 00:00:00 2001
From: Adam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
Date: Mon, 18 Jun 2012 06:35:12 -0400
Subject: [PATCH] unified .gitignore

---
 .gitignore |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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
 
-- 
1.7.9.5