From 4f89834e7b46dd7f23ba4aeaeb257e0387f1842a Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Mon, 13 Dec 2021 22:51:42 +0100
Subject: [PATCH] Remove comments that clash with git merge markers

---
 gtk2_ardour/triggerbox_ui.cc | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/gtk2_ardour/triggerbox_ui.cc b/gtk2_ardour/triggerbox_ui.cc
index f1df553d56..2e8482ad9e 100644
--- a/gtk2_ardour/triggerbox_ui.cc
+++ b/gtk2_ardour/triggerbox_ui.cc
@@ -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.));