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
@@ -80,7 +80,6 @@ void WindowManager::showAccountSelectPopup(QPoint point)

    QPoint buttonPos = point;
    w->move(buttonPos.x() - 30, buttonPos.y());
-
    w->show();
    w->setFocus();
 }