resolving merge conflicts

[unres.git] / examples / unres / MD / ff_gab / 1L2Y_minim.inp

diff --git a/examples/unres/MD/ff_gab/1L2Y_minim.inp b/examples/unres/MD/ff_gab/1L2Y_minim.inp
index a770a21..2830886 100644 (file)
--- a/examples/unres/MD/ff_gab/1L2Y_minim.inp
+++ b/examples/unres/MD/ff_gab/1L2Y_minim.inp
@@ -1,11 +1,6 @@
 1L2Y
-<<<<<<< HEAD
 SEED=-3059743 REFSTR PDBREF MINIMIZE
 
-=======
-SEED=-3059743 PDBREF ENE
-maxmin=1000
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
 WLONG=1.35279 WSCP=1.59304 WELEC=0.71534 WBOND=1.00000 WANG=1.13873            &
 WSCLOC=0.16258 WTOR=1.98599 WTORD=1.57069 WCORRH=0.42887 WCORR5=0.00000        &
 WCORR6=0.00000 WEL_LOC=0.16036 WTURN3=1.68722 WTURN4=0.66230 WTURN6=0.00000    &