From 94561b233136334c7507925b04a345adb0e6c769 Mon Sep 17 00:00:00 2001
From: SteveAmor <SteveAmor@users.noreply.github.com>
Date: Sun, 2 Jan 2022 21:49:18 +0000
Subject: resolves conflicts

---
 src/displayapp/screens/settings/Settings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/displayapp/screens/settings/Settings.cpp')

diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index dfff53aa..678ad82e 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);
-- 
cgit v1.2.3-70-g09d2