add const_cast to avoid compiler warnings from apple gcc

[ardour.git] / gtk2_ardour / mixer_ui.h

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 1d7a0f11142aa9133988a209de18d410537873c1..e5985f830c20ec180071b6c7b31d2be9862fac4d 100644 (file)
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -347,7 +347,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
 
        void monitor_section_going_away ();
 
-<<<<<<< HEAD
        void monitor_section_attached ();
        void monitor_section_detached ();
 
@@ -358,10 +357,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        void sync_treeview_favorite_ui_state (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&);
        void save_favorite_ui_state (const Gtk::TreeModel::iterator& iter, const Gtk::TreeModel::Path& path);
 
-=======
-       void create_own_window ();
-
->>>>>>> the basics of tabbed
        /// true if we are in fullscreen mode
        bool _maximised;