diff options
| author | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 22:33:23 (GMT) |
|---|---|---|
| committer | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 22:33:23 (GMT) |
| commit | 7a0f72ed8bc373a0dc25ef1b39db98b128367cc2 (patch) | |
| tree | 222390b5c9a7252fe8f181806a820f5d9c45a940 | |
| parent | cc259b6a4ac93d507fa372a41ea653dedeb791ea (diff) | |
resolve conflicts
| -rw-r--r-- | src/displayapp/DisplayApp.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 6eb4564..41a72a6 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -419,13 +419,10 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) currentScreen = std::make_unique<Screens::SettingSetTime>(this, dateTimeController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); break; -<<<<<<< HEAD case Apps::SettingChimes: currentScreen = std::make_unique<Screens::SettingChimes>(this, settingsController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); break; -======= ->>>>>>> develop case Apps::BatteryInfo: currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); |