X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fcluster%2Fwham%2Fsrc%2Finclude_unres%2FCOMMON.INTERACT;fp=source%2Fcluster%2Fwham%2Fsrc%2Finclude_unres%2FCOMMON.INTERACT;h=2545afb203213aca04f69ab40567d6a9ec4e1e96;hb=52187c9365594597457799445140ea830f1141a3;hp=d4a58b553c3a7c10fd97b79763c8da4fe57de6a3;hpb=aebadf9023e437f497f92dfcf2303c16f60917c1;p=unres.git

diff --git a/source/cluster/wham/src/include_unres/COMMON.INTERACT b/source/cluster/wham/src/include_unres/COMMON.INTERACT
index d4a58b5..2545afb 100644
--- a/source/cluster/wham/src/include_unres/COMMON.INTERACT
+++ b/source/cluster/wham/src/include_unres/COMMON.INTERACT
@@ -19,8 +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