diff options
| author | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 21:49:18 (GMT) |
|---|---|---|
| committer | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 21:49:18 (GMT) |
| commit | 94561b233136334c7507925b04a345adb0e6c769 (patch) | |
| tree | 1b4c801a820c56f3f37a871dacd0ae0d284d9f22 /src/displayapp/Messages.h | |
| parent | c5282f94544c2f8a4247416e80a5c25966c0acdc (diff) | |
resolves conflicts
Diffstat (limited to 'src/displayapp/Messages.h')
| -rw-r--r-- | src/displayapp/Messages.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h index beada33..19d2c4d 100644 --- a/src/displayapp/Messages.h +++ b/src/displayapp/Messages.h @@ -15,6 +15,7 @@ namespace Pinetime { UpdateTimeOut, DimScreen, RestoreBrightness, + ShowPairingKey, AlarmTriggered, Clock }; |