From: Cezary Czaplewski <czarek@chem.univ.gda.pl>
Date: Tue, 19 Feb 2013 01:41:54 +0000 (+0100)
Subject: repairs error in merge
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=98d88dd74b4fb38dc47ba014b2db665d0f55379f;hp=1606e1ed3e01fa02529bc9121a2583e4328ff69b;p=unres.git

repairs error in merge
---

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.