Merge branch 'combine_datetime'

This commit is contained in:
Reinhold Gschweicher 2023-01-15 22:41:07 +01:00
commit 168ff53cb4
2 changed files with 3 additions and 6 deletions

@ -1 +1 @@
Subproject commit b56c5f25f077d17b23677cdd0d4dc247ce7c421f Subproject commit a7f8b59bfb1641dea7f30a267c6bf7e882d9edbf

View File

@ -99,11 +99,8 @@ Missing::Missing(Pinetime::Applications::DisplayApp* app, Pinetime::Applications
case Pinetime::Applications::Apps::SettingSteps: case Pinetime::Applications::Apps::SettingSteps:
screen_lbl = "SettingSteps"; screen_lbl = "SettingSteps";
break; break;
case Pinetime::Applications::Apps::SettingSetDate: case Pinetime::Applications::Apps::SettingSetDateTime:
screen_lbl = "SettingSetDate"; screen_lbl = "SettingSetDateTime";
break;
case Pinetime::Applications::Apps::SettingSetTime:
screen_lbl = "SettingSetTime";
break; break;
case Pinetime::Applications::Apps::SettingChimes: case Pinetime::Applications::Apps::SettingChimes:
screen_lbl = "SettingChimes"; screen_lbl = "SettingChimes";