X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Funres%2Fsrc_MD%2FMREMD.F;fp=source%2Funres%2Fsrc_MD%2FMREMD.F;h=7ae643028725eb0e3de8017ed8d36bccad4f8433;hb=c45f3ac598572d95b62213f9ed78f4990a8f7735;hp=cf6a411210ff97881d6784938aeb33652102c9b1;hpb=c3d632cf84fd647434c093cb3fd69ea605293f75;p=unres.git

diff --git a/source/unres/src_MD/MREMD.F b/source/unres/src_MD/MREMD.F
index cf6a411..7ae6430 100644
--- 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,