X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fcluster%2Fwham%2Fsrc%2Fprobabl.F;h=bdca32a5328e5fc234f327ed232065d5f5fa2c7b;hb=6afd4863682c2aea9d9b514beab6404c19164a57;hp=fa10f58aa671a5fb0ab521ae0b877a9fabf79814;hpb=d5d23fd0abb6c6a3f4ea6b09b89ffbbfe5713236;p=unres.git

diff --git a/source/cluster/wham/src/probabl.F b/source/cluster/wham/src/probabl.F
index fa10f58..bdca32a 100644
--- 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