X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fcluster%2Fwham%2Fsrc%2Finclude_unres%2FCOMMON.TORSION;h=8a12451d733dffe5994a6057bdbde7366422108b;hb=b3332a0737da32abddd105126f2c43a69da0419d;hp=957dcff79e91c8fd0799697e032da6f4cb0a6076;hpb=3a261ae36be53eb4fadc9f30179cebb122b5b280;p=unres.git

diff --git a/source/cluster/wham/src/include_unres/COMMON.TORSION b/source/cluster/wham/src/include_unres/COMMON.TORSION
index 957dcff..8a12451 100644
--- a/source/cluster/wham/src/include_unres/COMMON.TORSION
+++ b/source/cluster/wham/src/include_unres/COMMON.TORSION
@@ -4,13 +4,8 @@ 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