From 94561b233136334c7507925b04a345adb0e6c769 Mon Sep 17 00:00:00 2001
From: SteveAmor <SteveAmor@users.noreply.github.com>
Date: Sun, 2 Jan 2022 21:49:18 +0000
Subject: resolves conflicts

---
 src/displayapp/Messages.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/displayapp/Messages.h')

diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h
index beada33a..19d2c4d3 100644
--- a/src/displayapp/Messages.h
+++ b/src/displayapp/Messages.h
@@ -15,6 +15,7 @@ namespace Pinetime {
         UpdateTimeOut,
         DimScreen,
         RestoreBrightness,
+        ShowPairingKey,
         AlarmTriggered,
         Clock
       };
-- 
cgit v1.2.3-70-g09d2