projects / unres.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8e497e9)
repairs error in merge
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Tue, 19 Feb 2013 01:41:54 +0000 (02:41 +0100)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Tue, 19 Feb 2013 01:41:54 +0000 (02:41 +0100)
source/unres/src_CSA_DiL/refsys.f patch | blob | history

diff --git a/source/unres/src_CSA_DiL/refsys.f b/source/unres/src_CSA_DiL/refsys.f
index 05030b5..b57c201 100644 (file)
--- 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.
UNRESPACK 3.x