diff options
| author | mabuch <marcel.buechler@gmail.com> | 2022-04-18 12:35:31 (GMT) |
|---|---|---|
| committer | mabuch <marcel.buechler@gmail.com> | 2022-04-18 12:35:31 (GMT) |
| commit | 82a4f9aa68c3f8d5f3cfa6de87de078fe680d944 (patch) | |
| tree | cc83c0af796a029f9464003cda043f373b716749 /src/displayapp/Apps.h | |
| parent | ea14c580ca6296cb93facf526d65a2db0e3ff1b0 (diff) | |
| parent | 2607c3d79947e900ce4c5ded296f649677511a34 (diff) | |
resolved merge conflict after renaming PineTimeStyle to WatchFacePineTimeStyle
Diffstat (limited to 'src/displayapp/Apps.h')
| -rw-r--r-- | src/displayapp/Apps.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h index dc9e625..8aad953 100644 --- a/src/displayapp/Apps.h +++ b/src/displayapp/Apps.h @@ -38,7 +38,7 @@ namespace Pinetime { SettingSetTime, SettingChimes, SettingShakeThreshold, - SettingAirplaneMode, + SettingBluetooth, Error }; } |