Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel

[unres.git] / source / cluster / wham / src / include_unres / COMMON.INTERACT

diff --git a/source/cluster/wham/src/include_unres/COMMON.INTERACT b/source/cluster/wham/src/include_unres/COMMON.INTERACT
index 23bfd42..2545afb 100644 (file)
--- a/source/cluster/wham/src/include_unres/COMMON.INTERACT
+++ b/source/cluster/wham/src/include_unres/COMMON.INTERACT
@@ -19,7 +19,15 @@ C 12/1/95 Array EPS included in the COMMON block.
      & r0d(ntyp,2),rpp(2,2),epp(2,2),elpp6(2,2),elpp3(2,2),
      & eps_scp(20,2),rscp(20,2),eps_orig(ntyp,ntyp)
 c 12/5/03 modified 09/18/03 Bond stretching parameters.
+<<<<<<< HEAD
       double precision vbldp0,vbldsc0,akp,aksc,abond0
       integer nbondterm
       common /stretch/ vbldp0,vbldsc0(maxbondterm,ntyp),akp,
      & aksc(maxbondterm,ntyp),abond0(maxbondterm,ntyp),nbondterm(ntyp)
+=======
+      double precision vbldp0,vbldsc0,akp,aksc,abond0,distchainmax
+      integer nbondterm
+      common /stretch/ vbldp0,vbldsc0(maxbondterm,ntyp),akp,
+     & aksc(maxbondterm,ntyp),abond0(maxbondterm,ntyp),
+     & distchainmax,nbondterm(ntyp)
+>>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1