Fix merge conflicts

2019-09-08 22:58:17 +02:00
parent b06eb9df83 3404cc503c
commit b6f632701f
15 changed files with 74 additions and 65 deletions
@@ -19,7 +19,7 @@
 namespace chatterino {

 SelectChannelDialog::SelectChannelDialog(QWidget *parent)
-    : BaseWindow(parent, BaseWindow::EnableCustomFrame)
+    : BaseWindow(BaseWindow::EnableCustomFrame, parent)
    , selectedChannel_(Channel::getEmpty())
 {
    this->setWindowTitle("Select a channel to join");