Merge branch 'develop' into motion-sensor

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/DisplayApp.h
#	src/displayapp/lv_pinetime_theme.c
#	src/displayapp/screens/ApplicationList.cpp
#	src/drivers/TwiMaster.cpp
#	src/systemtask/SystemTask.h

1 files changed, 2 insertions, 2 deletions

diff --git a/src/displayapp/screens/FirmwareValidation.h b/src/displayapp/screens/FirmwareValidation.h
index 9eea86bd..b83f8238 100644
--- a/src/displayapp/screens/FirmwareValidation.h
+++ b/src/displayapp/screens/FirmwareValidation.h
@@ -17,7 +17,7 @@ namespace Pinetime {
           ~FirmwareValidation() override;
 
           bool Refresh() override;
-          bool OnButtonPushed() override;
+          
 
           void OnButtonEvent(lv_obj_t *object, lv_event_t event);
 
@@ -32,7 +32,7 @@ namespace Pinetime {
           lv_obj_t* labelButtonValidate;
           lv_obj_t* buttonReset;
           lv_obj_t* labelButtonReset;
-          bool running = true;
+          
       };
     }
   }