resolving merge conflicts

[unres.git] / source / cluster / wham / src / DIMENSIONS.COMPAR

diff --git a/source/cluster/wham/src/DIMENSIONS.COMPAR b/source/cluster/wham/src/DIMENSIONS.COMPAR
index f5d44d1..08e2231 100644 (file)
--- 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