From 6f4bf1335a1cf0a085309409db38b00dc29f5d0e Mon Sep 17 00:00:00 2001 From: Dawid Jagiela Date: Mon, 18 Jun 2012 21:31:24 +0200 Subject: [PATCH 1/1] fixed merge conflict in readrtns_csa.F --- source/unres/src_CSA/readrtns_csa.F | 5 ----- 1 file changed, 5 deletions(-) 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 -- 1.7.9.5