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
@@ -11,9 +11,8 @@
 namespace chatterino {

 UpdateDialog::UpdateDialog()
-    : BaseWindow(nullptr,
-                 BaseWindow::Flags(BaseWindow::Frameless | BaseWindow::TopMost |
-                                   BaseWindow::EnableCustomFrame))
+    : BaseWindow({BaseWindow::Frameless, BaseWindow::TopMost,
+                  BaseWindow::EnableCustomFrame})
 {
    auto layout =
        LayoutCreator<UpdateDialog>(this).setLayoutType<QVBoxLayout>();