X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_MD-M%2Funres.F;h=2a828f2ed1a1974f9590a43471585d80e494a76e;hb=112179844618f33018f0fc960f24c12b01f2766d;hp=4903ec0d7112ba2289cb908bb50588159a372441;hpb=a4cf9656533d18dc83449f074cfb85db23d08ebd;p=unres.git

diff --git a/source/unres/src_MD-M/unres.F b/source/unres/src_MD-M/unres.F
index 4903ec0..2a828f2 100644
--- a/source/unres/src_MD-M/unres.F
+++ b/source/unres/src_MD-M/unres.F
@@ -196,23 +196,18 @@ c---------------------------------------------------------------------------
       double precision energy(0:n_ene)
       double precision energy_long(0:n_ene),energy_short(0:n_ene)
       double precision varia(maxvar)
-<<<<<<< HEAD
       if (indpdb.eq.0)     call chainbuild
-      time00=MPI_Wtime()
       print *,'dc',c(1,1)
       if (indpdb.ne.0) then
       dc(1,0)=c(1,1)
       dc(2,0)=c(2,1)
       dc(3,0)=c(3,1)
       endif
-=======
-      if (indpdb.eq.0) call chainbuild
 #ifdef MPI
       time00=MPI_Wtime()
 #else
       time00=tcpu()
 #endif
->>>>>>> f5379d3246c4bd95e946c4d35d4a1c13e329c4cb
       call chainbuild_cart
       print *,'dc',dc(1,0),dc(2,0),dc(3,0)
       if (split_ene) then