From ef44b763d94cc6ff1be6f75ff3e638d7d356e99e Mon Sep 17 00:00:00 2001
From: Jean-François Milants <jf@codingfield.com>
Date: Sun, 20 Feb 2022 15:40:49 +0100
Subject: Merge branch 'airplane-mode' of
 https://github.com/evergreen22/InfiniTime into evergreen22-airplane-mode
 Apply a few changes that were requested in the PR during the review.

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/Messages.h
#	src/displayapp/screens/settings/Settings.cpp
---
 src/displayapp/Messages.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h
index 62256b9e..58df4556 100644
--- a/src/displayapp/Messages.h
+++ b/src/displayapp/Messages.h
@@ -22,7 +22,7 @@ namespace Pinetime {
         ShowPairingKey,
         AlarmTriggered,
         Clock,
-        AirplaneModeToggle
+        BleRadioEnableToggle
       };
     }
   }
-- 
cgit v1.2.3-70-g09d2