X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;fp=.gitignore;h=2086bde2fc77bd92a15ab9ef5a6e8a0d92b9a646;hb=33ca65593386f7dce46c59efeb0f77b996757cbf;hp=1eced545f33f30d3fccd4bc8e9ef8afda464c77f;hpb=9b46e3da575cb549a4070ee7d0c75efc729951e6;p=unres.git

diff --git a/.gitignore b/.gitignore
index 1eced54..2086bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,10 +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