Remove comments that clash with git merge markers
This commit is contained in:
parent
28410ebb9a
commit
4f89834e7b
@ -197,7 +197,6 @@ TriggerEntry::render (ArdourCanvas::Rect const & area, Cairo::RefPtr<Cairo::Cont
|
||||
context->set_identity_matrix();
|
||||
}
|
||||
|
||||
|
||||
{
|
||||
//line at right
|
||||
context->set_identity_matrix();
|
||||
@ -304,10 +303,6 @@ TriggerEntry::ui_parameter_changed (std::string const& p)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* ---------------------------- */
|
||||
|
||||
Gtkmm2ext::Bindings* TriggerBoxUI::bindings = 0;
|
||||
Glib::RefPtr<Gtk::ActionGroup> TriggerBoxUI::trigger_actions;
|
||||
|
||||
@ -814,9 +809,6 @@ TriggerBoxUI::rapid_update ()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* ------------ */
|
||||
|
||||
TriggerBoxWidget::TriggerBoxWidget (TriggerBox& tb, float w, float h) : FittedCanvasWidget(w,h)
|
||||
{
|
||||
ui = new TriggerBoxUI (root(), tb);
|
||||
@ -837,9 +829,6 @@ TriggerBoxWidget::on_unmap ()
|
||||
ui->stop_updating ();
|
||||
}
|
||||
|
||||
|
||||
/* ------------ */
|
||||
|
||||
TriggerBoxWindow::TriggerBoxWindow (TriggerBox& tb)
|
||||
{
|
||||
TriggerBoxWidget* tbw = manage (new TriggerBoxWidget (tb, -1., TriggerBox::default_triggers_per_box*16.));
|
||||
|
Loading…
Reference in New Issue
Block a user