Fixed more merge problems

This commit is contained in:
Luis Ángel San Martín 2019-09-19 22:49:00 +02:00
parent a0f682be7b
commit 8f845727ae

View File

@ -34,6 +34,9 @@ private:
QLabel *opacityLabel;
QLabel *blurLabel;
QPushButton *resetButton;
QCheckBox *displayContinueReadingBannerCheck;
QCheckBox *trayIconCheckbox;
QCheckBox *startToTrayCheckbox;
};
#endif