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

diff --git a/source/unres/src_MD-M/refsys.f b/source/unres/src_MD-M/refsys.f
index b57c201..a6aa5e9 100644
--- a/source/unres/src_MD-M/refsys.f
+++ b/source/unres/src_MD-M/refsys.f
@@ -1,8 +1,13 @@
       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