X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=2086bde2fc77bd92a15ab9ef5a6e8a0d92b9a646;hb=325eda160c9ad2982501e091ca40606a29043712;hp=2e4973fb7448507a6ded185a561e3f2814ed1d6f;hpb=befb4994bdeb1dd3bb9d17881522e33b31bc0ea1;p=unres.git

diff --git a/.gitignore b/.gitignore
index 2e4973f..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
@@ -31,3 +40,5 @@ period_build
 build_devel
 build_theta
 build_new
+build_prere/
+period_build2