From 49be513bfab86e77966daa53268daffc346320f5 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 8 Oct 2015 13:40:00 -0400
Subject: [PATCH] fix rebase conflicts left over after pull

---
 libs/surfaces/mackie/strip.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index 6be3c79b5d..188aac07e0 100644
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -376,8 +376,6 @@ Strip::notify_trim_changed (bool force_update)
 				queue_parameter_display (TrimAutomation, gain_coefficient);
 			}
 			_last_trim_position_written = normalized_position;
-
-			queue_display_reset (2000);
 		}
 	}
 }
@@ -980,7 +978,7 @@ Strip::potmode_changed (bool notify)
 		/* do not change vpot mode while in flipped mode */
 		DEBUG_TRACE (DEBUG::MackieControl, "not stepping pot mode - in flip mode\n");
 		_surface->write (display (1, "Flip"));
-		queue_display_reset (1000);
+		block_vpot_mode_display_for (1000);
 		return;
 	}
 	// WIP