From 4b51a15e3a55d898354b32c8bb7753e1bcd1137c Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Mon, 26 Jan 2015 09:01:19 +0100
Subject: [PATCH] stupid mistake in merging
---
src/core/Action.cpp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/core/Action.cpp b/src/core/Action.cpp
index 206a33844..abc35813e 100644
--- a/src/core/Action.cpp
+++ b/src/core/Action.cpp
@@ -78,13 +78,10 @@ Action::Action(const ActionOptions&ao):
}
if( plumed.getActionSet().selectWithLabel<Action*>(label) ) error("label " + label + " has been already used");
log.printf(" with label %s\n",label.c_str());
-<<<<<<< HEAD
if ( keywords.exists("UPDATE_FROM") ) parse("UPDATE_FROM",update_from);
if(update_from!=std::numeric_limits<double>::max()) log.printf(" only update from time %f\n",update_from);
if ( keywords.exists("UPDATE_UNTIL") ) parse("UPDATE_UNTIL",update_until);
if(update_until!=std::numeric_limits<double>::max()) log.printf(" only update until time %f\n",update_until);
-=======
-
if ( keywords.exists("RESTART") ){
std::string srestart="AUTO";
parse("RESTART",srestart);
@@ -93,7 +90,6 @@ Action::Action(const ActionOptions&ao):
else if(srestart=="AUTO") {}
else error("RESTART should be either YES, NO, or AUTO");
}
->>>>>>> v2.1-per-action-restart
}
Action::~Action(){
--
GitLab