resolves conflicts

2022-01-02 21:49:18 +00:00
parent c5282f9454
commit 94561b2331
4 changed files with 3 additions and 7 deletions
--- a/src/displayapp/Messages.h
+++ b/src/displayapp/Messages.h
@@ -15,6 +15,7 @@ namespace Pinetime {
        UpdateTimeOut,
        DimScreen,
        RestoreBrightness,
+        ShowPairingKey,
        AlarmTriggered,
        Clock
      };