summaryrefslogtreecommitdiff
path: root/src/windows/mainwindow.hpp
diff options
context:
space:
mode:
authorouwou <26526779+ouwou@users.noreply.github.com>2023-02-14 19:54:07 -0500
committerouwou <26526779+ouwou@users.noreply.github.com>2023-02-14 19:54:07 -0500
commit345a84e654fa539b3d33811e068c6273cda81ffe (patch)
tree59ac32e37a871ace0adbef764a2593a4d18b46b2 /src/windows/mainwindow.hpp
parentc1303bd289013a504b529f8f19444f12e4884040 (diff)
downloadabaddon-portaudio-345a84e654fa539b3d33811e068c6273cda81ffe.tar.gz
abaddon-portaudio-345a84e654fa539b3d33811e068c6273cda81ffe.zip
fix build
Diffstat (limited to 'src/windows/mainwindow.hpp')
-rw-r--r--src/windows/mainwindow.hpp8
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: