Merge branch 'master' of mmka.chem.univ.gda.pl:unres into homology

[unres.git] / source / unres / src_MD / MREMD.F

diff --git a/source/unres/src_MD/MREMD.F b/source/unres/src_MD/MREMD.F
index cf6a411..7ae6430 100644 (file)
--- a/source/unres/src_MD/MREMD.F
+++ b/source/unres/src_MD/MREMD.F
@@ -2033,7 +2033,11 @@ c     &                (d_restart1(j,i+2*nres*il),j=1,3)
               enddo
              endif
 #endif
+c<<<<<<< HEAD
 c Corrected AL 8/19/2014: each processor needs whole iset array not only its
+cv=======
+Corrected AL 8/19/2014: each processor needs whole iset array not only its
+c>>>>>>> 66693b0684c228404e7aadcffe6d2a8c9f489063
 c own element
 c              call mpi_scatter(i2set,1,mpi_integer,
 c     &           iset,1,mpi_integer,king,