From 9009bbf986f5cf8f90cfb76b7717364bb1d3aef6 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 4 Jul 2021 09:35:42 -0600
Subject: [PATCH] fix declaration of {Public,}Editor::do_import() (post rebase
 conflict resolution)

---
 gtk2_ardour/editor.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index c043b7a8b8..6541201f14 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -465,7 +465,8 @@ public:
 	                ARDOUR::MidiTrackNameSource           mts,
 	                ARDOUR::MidiTempoMapDisposition       mtd,
 	                Temporal::timepos_t&                  pos,
-	                boost::shared_ptr<ARDOUR::PluginInfo> instrument = boost::shared_ptr<ARDOUR::PluginInfo>());
+	                boost::shared_ptr<ARDOUR::PluginInfo> instrument = boost::shared_ptr<ARDOUR::PluginInfo>(),
+	                bool with_markers = false);
 
 	void do_embed (std::vector<std::string>              paths,
 	               Editing::ImportDisposition            disposition,