correction after cherry-pick and merge in last commit

[unres.git] / source / cluster / wham / src / probabl.F

diff --git a/source/cluster/wham/src/probabl.F b/source/cluster/wham/src/probabl.F
index fa10f58..bdca32a 100644 (file)
--- a/source/cluster/wham/src/probabl.F
+++ b/source/cluster/wham/src/probabl.F
@@ -209,11 +209,7 @@ cc        if (wcorr6.eq.0) ecorr6=0.0d0
           entfac(i)=entfac_(i)
         enddo
 #endif
-<<<<<<< HEAD
 c#define DEBUG
-=======
-
->>>>>>> 3d6f9e7... Adam's changes to wham and cluster following previous commit
 #ifdef DEBUG
         write (iout,*) "The FDIMLESS array before sorting"
         do i=1,ncon