From 8ce4b5f55a93bb074bb28a66bdcb5209ea54880e Mon Sep 17 00:00:00 2001
From: Matthew Barth <msbarth@us.ibm.com>
Date: Tue, 6 Nov 2018 13:54:46 -0600
Subject: Rebase correction (timerPos -> timerConfPos)

Change-Id: I5ab5adcc22f044b3cf0955082061c67f2a281307
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
---
 control/zone.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'control')

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 @@ void Zone::removeEvent(const SetSpeedEvent& event)
         }
     }
     // 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));
-- 
cgit v1.2.1