projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel
[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
911bd4e
..
f5d44d1
100644
(file)
--- 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:
*
*
* Array dimensions for level-based conformation comparison program:
*
+<<<<<<< HEAD
+=======
* Max. number of conformations in the data set.
*
integer maxconf
PARAMETER (MAXCONF=maxstr_proc)
*
* Max. number of conformations in the data set.
*
integer maxconf
PARAMETER (MAXCONF=maxstr_proc)
*
+>>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
* Max. number levels of comparison
*
integer maxlevel
* Max. number levels of comparison
*
integer maxlevel