resolves conflicts

This commit is contained in:
SteveAmor
2022-01-02 21:49:18 +00:00
parent c5282f9454
commit 94561b2331
4 changed files with 3 additions and 7 deletions

View File

@@ -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);