cleanup various merge conflict resolution errors/omissions

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index ace51c79cb30452f3e3aa13a073f3820be5cfdd0..180abfdeadb14dda607202b876c3cf6e029834e5 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -145,6 +145,10 @@ namespace Gtk {
        class ProgressBar;
 }
 
+namespace Gtkmm2ext {
+       class Tabbable;
+}
+
 class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 {
     public: