mirror of
https://github.com/YACReader/yacreader
synced 2025-11-14 14:02:45 -05:00
Fixed more merge problems
This commit is contained in:
@ -34,6 +34,9 @@ private:
|
|||||||
QLabel *opacityLabel;
|
QLabel *opacityLabel;
|
||||||
QLabel *blurLabel;
|
QLabel *blurLabel;
|
||||||
QPushButton *resetButton;
|
QPushButton *resetButton;
|
||||||
|
QCheckBox *displayContinueReadingBannerCheck;
|
||||||
|
QCheckBox *trayIconCheckbox;
|
||||||
|
QCheckBox *startToTrayCheckbox;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user