From: Dawid Jagiela <lightnir@chem.univ.gda.pl>
Date: Mon, 18 Jun 2012 19:31:24 +0000 (+0200)
Subject: fixed merge conflict in readrtns_csa.F
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=e8f3b0ef0006bd88c51211fa78c0bf2ef3fdee9e;p=unres.git

fixed merge conflict in readrtns_csa.F
---

diff --git a/source/unres/src_CSA/readrtns_csa.F b/source/unres/src_CSA/readrtns_csa.F
index 6e222d4..17b2165 100644
--- a/source/unres/src_CSA/readrtns_csa.F
+++ b/source/unres/src_CSA/readrtns_csa.F
@@ -577,13 +577,8 @@ C     Juyong:READ read_info
 C     READ fragment information!!
 C     both routines should be in dfa.F file!!
 
-<<<<<<< HEAD
       if (.not. (wdfa_dist.eq.0.0 .and. wdfa_tor.eq.0.0 .and.
      &            wdfa_nei.eq.0.0 .and. wdfa_beta.eq.0.0)) then
-=======
-      if (.not. (wdfa_dist.eq.0.0 .and. wdfa_tor.eq.0.0
-     &      .and. wdfa_nei.eq.0.0 .and. wdfa_beta.eq.0.0)) then
->>>>>>> adam
        call init_dfa_vars
        print*, 'init_dfa_vars finished!'
        call read_dfa_info