diff options
Diffstat (limited to 'src/windows/mainwindow.hpp')
| -rw-r--r-- | src/windows/mainwindow.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/windows/mainwindow.hpp b/src/windows/mainwindow.hpp index 90e49b4..5cad82f 100644 --- a/src/windows/mainwindow.hpp +++ b/src/windows/mainwindow.hpp @@ -3,11 +3,11 @@ #include "components/chatwindow.hpp" #include "components/memberlist.hpp" #include "components/friendslist.hpp" -<<<<<<< HEAD #include "components/voiceinfobox.hpp" -#include <gtkmm.h> -======= ->>>>>>> master +#include <gtkmm/window.h> +#include <gtkmm/stack.h> +#include <gtkmm/menubar.h> +#include <gtkmm/checkmenuitem.h> class MainWindow : public Gtk::Window { public: |