From 9673e6b2716d2ac1adf3f3ca277bbef60ed4e7cb Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Thu, 16 Jul 2015 17:14:14 -0500 Subject: [PATCH] merge fix again --- gtk2_ardour/editor_ops.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 50b7c81b44..6b1960e30a 100644 --- 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()); -- 2.30.2