X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_MD-M%2Frefsys.f;h=b57c201f2740c7316e88694d7eeb5c3b5d2b3464;hb=e7a75c5f4fa5e7080475f2c6b0fcd4af3bb31e72;hp=a6aa5e9c3fc67ece385f726c3e1f3d2f85a2baaf;hpb=11ea3eda73c0b19534cfde7f580aa34d16de2099;p=unres.git

diff --git a/source/unres/src_MD-M/refsys.f b/source/unres/src_MD-M/refsys.f
index a6aa5e9..b57c201 100644
--- a/source/unres/src_MD-M/refsys.f
+++ b/source/unres/src_MD-M/refsys.f
@@ -1,13 +1,8 @@
       subroutine refsys(i2,i3,i4,e1,e2,e3,fail)
-<<<<<<< HEAD
       implicit real*8 (a-h,o-z)
       include 'DIMENSIONS'
 c this subroutine calculates unity vectors of a local reference system
 c defined by atoms (i2), (i3), and (i4). the x axis is the axis from
-=======
-c This subroutine calculates unit vectors of a local reference system
-c defined by atoms (i2), (i3), and (i4). The x axis is the axis from
->>>>>>> 9a082c1ab203120d8e865971546d473fb146fcdc
 c atom (i3) to atom (i2), and the xy plane is the plane defined by atoms
 c (i2), (i3), and (i4). z axis is directed according to the sign of the
 c vector product (i3)-(i2) and (i3)-(i4). sets fail to .true. if atoms