X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_CSA%2Freadrtns_csa.F;h=6e222d42a68ea1184a2950521a890f3fb84bbdad;hb=951f0fe4ce7a66542c398754524d8ae3d9b5dc5a;hp=a070596f0447ce54ad406861a48af9cd937964dc;hpb=75b3ea58d504a01718b1cf658c0bbf81bbd36445;p=unres.git

diff --git a/source/unres/src_CSA/readrtns_csa.F b/source/unres/src_CSA/readrtns_csa.F
index a070596..6e222d4 100644
--- 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