Merge branch 'develop' into infineat-external-resources

# Conflicts:
#	src/displayapp/screens/Symbols.h
#	src/displayapp/screens/settings/SettingWatchFace.cpp
#	src/displayapp/screens/settings/SettingWatchFace.h

1 files changed, 4 insertions, 4 deletions

diff --git a/src/BootloaderVersion.cpp b/src/BootloaderVersion.cpp
index 7f7f5c86..16e86962 100644
--- a/src/BootloaderVersion.cpp
+++ b/src/BootloaderVersion.cpp
@@ -9,15 +9,15 @@ using namespace Pinetime;
 uint32_t BootloaderVersion::version = 0;
 char BootloaderVersion::versionString[BootloaderVersion::VERSION_STR_LEN] = "0.0.0";
 
-const uint32_t BootloaderVersion::Major() {
+uint32_t BootloaderVersion::Major() {
   return (BootloaderVersion::version >> 16u) & 0xff;
 }
 
-const uint32_t BootloaderVersion::Minor() {
+uint32_t BootloaderVersion::Minor() {
   return (BootloaderVersion::version >> 8u) & 0xff;
 }
 
-const uint32_t BootloaderVersion::Patch() {
+uint32_t BootloaderVersion::Patch() {
   return BootloaderVersion::version & 0xff;
 }
 
@@ -25,7 +25,7 @@ const char* BootloaderVersion::VersionString() {
   return BootloaderVersion::versionString;
 }
 
-const bool BootloaderVersion::IsValid() {
+bool BootloaderVersion::IsValid() {
   return BootloaderVersion::version >= 0x00010000;
 }