From 1158271f728dee55fcbd4ae942f04a70fa8be852 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 15 Jul 2015 16:24:12 -0400
Subject: remove "toggle-foo" style actions related to editor/mixer windows and
 provide new methods that just use Tabbable::make_visible()

---
 gtk2_ardour/window_manager.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gtk2_ardour/window_manager.h')

diff --git a/gtk2_ardour/window_manager.h b/gtk2_ardour/window_manager.h
index 5d1349f258..5ee9d16f99 100644
--- a/gtk2_ardour/window_manager.h
+++ b/gtk2_ardour/window_manager.h
@@ -153,7 +153,6 @@ class ProxyWithConstructor: public ProxyBase
 
                                         private:
 	boost::function<T*()>	creator;
->>>>>>> first compilable version of tabbable design.
 };
 
 template<typename T>
-- 
cgit v1.2.3