From: Adam Liwo <adam@matrix.chem.cornell.edu>
Date: Mon, 18 Jun 2012 13:58:32 +0000 (-0400)
Subject: Merge branch 'adam' into devel
X-Git-Tag: v.3.2~80^2~11
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=951f0fe4ce7a66542c398754524d8ae3d9b5dc5a

Merge branch 'adam' into devel
Merging adam with devel
Conflicts:
	source/unres/src_CSA/readrtns_csa.F
---

951f0fe4ce7a66542c398754524d8ae3d9b5dc5a
diff --cc bin/unres/CSA/unres_csa_ifort_mpich-1.2.7p1.exe~adam
index 0000000,0000000..59d3545
new file mode 100755
Binary files differ
diff --cc source/unres/src_CSA/readrtns_csa.F
index df144f4,a070596..6e222d4
--- a/source/unres/src_CSA/readrtns_csa.F
+++ b/source/unres/src_CSA/readrtns_csa.F
@@@ -577,8 -577,8 +577,13 @@@ C     Juyong:READ read_inf
  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