correction after cherry-pick and merge in last commit

[unres.git] / source / wham / src / energy_p_new.F

diff --git a/source/wham/src/energy_p_new.F b/source/wham/src/energy_p_new.F
index 2dc4aa7..dc42b11 100644 (file)
--- a/source/wham/src/energy_p_new.F
+++ b/source/wham/src/energy_p_new.F
@@ -4601,12 +4601,9 @@ c   3 = SC...Ca...Ca...SCi
           cosphi=dcos(j*tauangle(intertyp,i))
           sinphi=dsin(j*tauangle(intertyp,i))
           esccor=esccor+v1ij*cosphi+v2ij*sinphi
-<<<<<<< HEAD
-=======
 #ifdef DEBUG
           esccor_ii=esccor_ii+v1ij*cosphi+v2ij*sinphi
 #endif
->>>>>>> 3d6f9e7... Adam's changes to wham and cluster following previous commit
           gloci=gloci+j*(v2ij*cosphi-v1ij*sinphi)
         enddo
         gloc_sc(intertyp,i-3,icg)=gloc_sc(intertyp,i-3,icg)+wsccor*gloci