Merge branch 'adam' into devel

[unres.git] / source / unres / src_CSA / readrtns_csa.F

diff --git a/source/unres/src_CSA/readrtns_csa.F b/source/unres/src_CSA/readrtns_csa.F
index a070596..6e222d4 100644 (file)
--- a/source/unres/src_CSA/readrtns_csa.F
+++ b/source/unres/src_CSA/readrtns_csa.F
@@ -577,8 +577,13 @@ 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