post rebase fixes

2022-05-16 12:05:14 +02:00
parent 319dfd23e7
commit 917e46c684
9 changed files with 113 additions and 85 deletions
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -98,10 +98,6 @@ namespace Pinetime {
        appMenu = menu;
      };

-      uint8_t GetAppMenu() const {
-        return appMenu;
-      };
-
      void SetWatchfacesMenu(uint8_t menu) {
        watchFacesMenu = menu;
      };
@@ -110,6 +106,11 @@ namespace Pinetime {
        return watchFacesMenu;
      };

+
+      uint8_t GetAppMenu() const {
+        return appMenu;
+      };
+
      void SetSettingsMenu(uint8_t menu) {
        settingsMenu = menu;
      };