X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_CSA_DiL%2Frefsys.f;h=b57c201f2740c7316e88694d7eeb5c3b5d2b3464;hb=4f408e0046bb5dad39727ced2f2fec1e5a5fab88;hp=05030b55215c90bd2954bf908528a464a81e72df;hpb=8e497e9164f178434ae24e6dc4397d4cfde452a3;p=unres.git

diff --git a/source/unres/src_CSA_DiL/refsys.f b/source/unres/src_CSA_DiL/refsys.f
index 05030b5..b57c201 100644
--- a/source/unres/src_CSA_DiL/refsys.f
+++ b/source/unres/src_CSA_DiL/refsys.f
@@ -11,10 +11,7 @@ c form a linear fragment. returns vectors e1, e2, and e3.
       logical fail
       double precision e1(3),e2(3),e3(3)
       double precision u(3),z(3)
-<<<<<<< HEAD
-=======
       include 'COMMON.IOUNITS'
->>>>>>> prerelease-3.2.1
       include "COMMON.CHAIN"
       data coinc /1.0d-13/,align /1.0d-13/
       fail=.false.