--- trunk/OOPSE/libmdtools/Integrator.cpp	2003/08/26 20:29:26	725
+++ trunk/OOPSE/libmdtools/Integrator.cpp	2003/08/26 20:37:30	726
@@ -191,7 +191,6 @@ template<typename T> void Integrator<T>::integrate(voi
   currSample  = sampleTime + info->getTime();
   currThermal = thermalTime+ info->getTime();
   currStatus  = statusTime + info->getTime();
->>>>>>> 1.18
 
   dumpOut->writeDump(info->getTime());
   statOut->writeStat(info->getTime());