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

diff --git a/source/cluster/wham/src/include_unres/COMMON.TORSION b/source/cluster/wham/src/include_unres/COMMON.TORSION
index 55cc7f4..957dcff 100644
--- a/source/cluster/wham/src/include_unres/COMMON.TORSION
+++ b/source/cluster/wham/src/include_unres/COMMON.TORSION
@@ -4,8 +4,13 @@ C Torsional constants of the rotation about virtual-bond dihedral angles
       common/torsion/v0(maxtor,maxtor),v1(maxterm,maxtor,maxtor),
      &    v2(maxterm,maxtor,maxtor),vlor1(maxlor,maxtor,maxtor),
      &    vlor2(maxlor,maxtor,maxtor),vlor3(maxlor,maxtor,maxtor),
+<<<<<<< HEAD
+     &    itortyp(ntyp),ntortyp,nterm(maxtor,maxtor),nlor(maxtor,maxtor) 
+     &    ,nterm_old
+=======
      &    itortyp(ntyp),ntortyp,nterm(maxtor,maxtor),
      &    nlor(maxtor,maxtor),nterm_old
+>>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
 C 6/23/01 - constants for double torsionals
       double precision v1c,v1s,v2c,v2s
       integer ntermd_1,ntermd_2