Merge branch 'devel' into AFM

[unres.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2086bde..7307b9c 100644 (file)
--- 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