Fix merge conflicts

This commit is contained in:
Leon Richardt
2019-09-08 22:58:17 +02:00
15 changed files with 74 additions and 65 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
namespace chatterino {
WelcomeDialog::WelcomeDialog()
: BaseWindow(nullptr, BaseWindow::EnableCustomFrame)
: BaseWindow(BaseWindow::EnableCustomFrame)
{
this->setWindowTitle("Chatterino quick setup");
}