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
@@ -43,8 +43,7 @@ namespace {
 }  // namespace

 UserInfoPopup::UserInfoPopup()
-    : BaseWindow(nullptr, BaseWindow::Flags(BaseWindow::Frameless |
-                                            BaseWindow::FramelessDraggable))
+    : BaseWindow({BaseWindow::Frameless, BaseWindow::FramelessDraggable})
    , hack_(new bool)
 {
    this->setStayInScreenRect(true);