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

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

diff --git a/source/cluster/wham/src/include_unres/COMMON.TORSION b/source/cluster/wham/src/include_unres/COMMON.TORSION
index 8a12451..957dcff 100644 (file)
--- 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