X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=2086bde2fc77bd92a15ab9ef5a6e8a0d92b9a646;hb=4a3d4a16fc1c0c5c973b9ca6ada3c4b0a2152651;hp=d0edd88695873d673fdd9741775c21ebb7d6ab5a;hpb=0d0c28ca14abcf99ccb778cdba15a9646736571d;p=unres.git

diff --git a/.gitignore b/.gitignore
index d0edd88..2086bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,15 @@ cinfo.f
 # ignore build dir
 build/
 build2/
+<<<<<<< HEAD
+build_prere/
+period_build/
+period_build2/
+build_*/
+=======
+build_*/
+period_*/
+>>>>>>> master
 
 # latex files in documentation 
 doc/*/*.aux