resolves conflicts

2022-01-02 22:27:43 +00:00
parent 94561b2331 e0013e7304
commit cc259b6a4a
236 changed files with 4120 additions and 1555 deletions
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -25,6 +25,8 @@ namespace Pinetime {
      Metronome,
      Motion,
      Steps,
+      Weather,
+      PassKey,
      QuickSettings,
      Settings,
      SettingWatchFace,
@@ -32,7 +34,6 @@ namespace Pinetime {
      SettingDisplay,
      SettingWakeUp,
      SettingSteps,
-      SettingPineTimeStyle,
      SettingSetDate,
      SettingSetTime,
      SettingChimes,