merge fix again

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 50b7c81b44128f4a9de9c4f0e18f08f6dbf8c8cf..6b1960e30a711f097696567ae7f0f483778a3a74 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -7421,9 +7421,9 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
        if (tempo_too) {
                XMLNode& before (_session->tempo_map().get_state());
 
-               if (_session->tempo_map().cut_time (pos, frames) ) {
+               if (_session->tempo_map().remove_time (pos, frames) ) {
                        if (!in_command) {
-                               begin_reversible_command (_("cut time"));
+                               begin_reversible_command (_("remove time"));
                                in_command = true;
                        }
                        XMLNode& after (_session->tempo_map().get_state());