diff options
Diffstat (limited to 'gtk2_ardour/window_manager.h')
| -rw-r--r-- | gtk2_ardour/window_manager.h | 1 |
1 files changed, 0 insertions, 1 deletions
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> |