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

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