fix last cherry-pick

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 13b1e833f9a8184cc2aea9c2bbc7b168ac19bcd6..6239aea24d6e7ec98861326d14972c03ff93298b 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -1053,12 +1053,6 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed
                return;
        }
 
-       if (_x_constrained) {
-               _editor->begin_reversible_command (Operations::fixed_time_region_copy);
-       } else {
-               _editor->begin_reversible_command (Operations::region_copy);
-       }
-
        typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping;
        PlaylistMapping playlist_mapping;
 
@@ -1148,18 +1142,9 @@ RegionMoveDrag::finished_no_copy (
                return;
        }
 
-<<<<<<< HEAD
-=======
-       if (_x_constrained) {
-               _editor->begin_reversible_command (_("fixed time region drag"));
-       } else {
-               _editor->begin_reversible_command (Operations::region_drag);
-       }
-
        typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping;
        PlaylistMapping playlist_mapping;
 
->>>>>>> 1faf1a1... After dragging from multiple tracks to the dropzone, create the right number of new tracks.
        for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ) {
 
                RegionView* rv = i->view;