chatterino2
Code Issues

Fix merge conflicts

Browse Source
This commit is contained in:
Leon Richardt
2019-09-08 22:58:17 +02:00
parent b06eb9df83 3404cc503c
commit b6f632701f
15 changed files with 74 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/dialogs/NotificationPopup.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
namespace chatterino {
NotificationPopup::NotificationPopup()
: BaseWindow((QWidget *)nullptr, BaseWindow::Frameless)
: BaseWindow(BaseWindow::Frameless)
, channel_(std::make_shared<Channel>("notifications", Channel::Type::None))
{