X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=.gitignore;h=c0b1de623df135e16e40d0be896dc5d9df8faf2f;hb=f57658c1e8a49c4fcef754af796bf7a2ae9f28e2;hp=abb36400389eaae108e551739f6ec0c198a094dd;hpb=478f5fd9e95bd5665ab58ee691f517d7dab379b3;p=unres.git

diff --git a/.gitignore b/.gitignore
index abb3640..c0b1de6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # ignore compiled stuff
 *.[oa]
 
@@ -6,14 +5,16 @@
 *.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
+DIL/