Rebase correction (timerPos -> timerConfPos)
Change-Id: I5ab5adcc22f044b3cf0955082061c67f2a281307
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/control/zone.cpp b/control/zone.cpp
index 7b19acc..4e8a749 100644
--- a/control/zone.cpp
+++ b/control/zone.cpp
@@ -365,7 +365,7 @@
}
}
// Remove timers of the event
- if (std::get<intervalPos>(std::get<timerPos>(event)) != seconds(0))
+ if (std::get<intervalPos>(std::get<timerConfPos>(event)) != seconds(0))
{
auto it = findTimer(std::get<groupPos>(event),
std::get<actionsPos>(event));