From 437a655026fd3a6c4740a90b74f8a6421ccf2b0b Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 17 Aug 2014 18:04:58 -0400
Subject: [PATCH] fix broken manually merge conflict fix from earlier
 cherry-pick

---
 gtk2_ardour/editor_drag.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 502ba6dcd5..a2243e35cc 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -1619,7 +1619,7 @@ RegionRippleDrag::add_all_after_to_views(TimeAxisView *tav, framepos_t where, co
 
 			if (drag_in_progress) {
 				(*i)->drag_start();
-				ArdourCanvas::Group* rvg = (*i)->get_canvas_group();
+				ArdourCanvas::Item* rvg = (*i)->get_canvas_group();
 				Duple rv_canvas_offset = rvg->item_to_canvas (Duple (0,0));
 				rvg->set_position (rv_canvas_offset);
 			}