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

diff --git a/.gitignore b/.gitignore
index d5615a4..abb3640 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,19 @@
+<<<<<<< HEAD
+# ignore compiled stuff
+*.[oa]
+
+# ignore texteditors
+*.swp
+*~
+
+
+# ifnore build dir
+build/
+=======
 ~.[ao]
 gradcheck/
 mapcheck/
 run/
 sympcheck/
+>>>>>>> adasko