X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fcluster%2Fwham%2Fsrc%2FDIMENSIONS.COMPAR;fp=source%2Fcluster%2Fwham%2Fsrc%2FDIMENSIONS.COMPAR;h=f5d44d13fa14c146b54e0670e951aa388b085ea1;hb=52187c9365594597457799445140ea830f1141a3;hp=911bd4ec1e4f0ab9e73cde175b5f1ef98b4bc506;hpb=aebadf9023e437f497f92dfcf2303c16f60917c1;p=unres.git

diff --git a/source/cluster/wham/src/DIMENSIONS.COMPAR b/source/cluster/wham/src/DIMENSIONS.COMPAR
index 911bd4e..f5d44d1 100644
--- a/source/cluster/wham/src/DIMENSIONS.COMPAR
+++ b/source/cluster/wham/src/DIMENSIONS.COMPAR
@@ -2,11 +2,14 @@
 *
 * 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