diff options
| author | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 21:49:18 (GMT) |
|---|---|---|
| committer | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 21:49:18 (GMT) |
| commit | 94561b233136334c7507925b04a345adb0e6c769 (patch) | |
| tree | 1b4c801a820c56f3f37a871dacd0ae0d284d9f22 /src/displayapp/screens/settings/Settings.cpp | |
| parent | c5282f94544c2f8a4247416e80a5c25966c0acdc (diff) | |
resolves conflicts
Diffstat (limited to 'src/displayapp/screens/settings/Settings.cpp')
| -rw-r--r-- | src/displayapp/screens/settings/Settings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp index dfff53a..678ad82 100644 --- a/src/displayapp/screens/settings/Settings.cpp +++ b/src/displayapp/screens/settings/Settings.cpp @@ -61,9 +61,9 @@ std::unique_ptr<Screen> Settings::CreateScreen3() { std::array<Screens::List::Applications, 4> applications {{ {Symbols::clock, "Chimes", Apps::SettingChimes}, - {Symbols::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle}, {Symbols::check, "Firmware", Apps::FirmwareValidation}, {Symbols::list, "About", Apps::SysInfo}, + {Symbols::none, "None", Apps::None} }}; return std::make_unique<Screens::List>(2, 3, app, settingsController, applications); |