X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fcluster%2Fwham%2Fsrc%2FDIMENSIONS.COMPAR;h=08e22317b493521e9f1ba399a9de1d8798f3f903;hb=ad302a188285d46b4af6f809daf9729c6b9b017e;hp=f5d44d13fa14c146b54e0670e951aa388b085ea1;hpb=3a261ae36be53eb4fadc9f30179cebb122b5b280;p=unres.git

diff --git a/source/cluster/wham/src/DIMENSIONS.COMPAR b/source/cluster/wham/src/DIMENSIONS.COMPAR
index f5d44d1..08e2231 100644
--- a/source/cluster/wham/src/DIMENSIONS.COMPAR
+++ b/source/cluster/wham/src/DIMENSIONS.COMPAR
@@ -2,14 +2,6 @@
 *
 * Array dimensions for level-based conformation comparison program:
 *
-<<<<<<< HEAD
-=======
-* Max. number of conformations in the data set.
-*
-      integer maxconf
-      PARAMETER (MAXCONF=maxstr_proc)
-*
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
 * Max. number levels of comparison
 *
       integer maxlevel