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

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