X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=25485f355e5b4958e76f139ed2f07f1dad4b1c23;hb=83b9be80ea20b01d836dd0bd65de97b3f46f1f43;hp=abb36400389eaae108e551739f6ec0c198a094dd;hpb=478f5fd9e95bd5665ab58ee691f517d7dab379b3;p=unres.git

diff --git a/.gitignore b/.gitignore
index abb3640..25485f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # ignore compiled stuff
 *.[oa]
 
@@ -6,14 +5,15 @@
 *.swp
 *~
 
+# ignore PBS output and error files
+*.[eo][0-9][0-9][0-9][0-9]*
 
-# ifnore build dir
+# ignore build dir
 build/
-=======
-~.[ao]
+
+# ignored dirs form adasko
 gradcheck/
 mapcheck/
 run/
 sympcheck/
->>>>>>> adasko
-
+compinfo