Change in energy_p_new_barrier.F, in eelec, aorund line 3065

[unres.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 408ced9..2086bde 100644 (file)
--- 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
@@ -29,3 +38,7 @@ DIL/
 compinfo
 period_build
 build_devel
+build_theta
+build_new
+build_prere/
+period_build2