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, 1 insertions, 2 deletions

diff --git a/src/displayapp/screens/Meter.h b/src/displayapp/screens/Meter.h
index 86888dda..6a1fc3bf 100644
--- a/src/displayapp/screens/Meter.h
+++ b/src/displayapp/screens/Meter.h
@@ -15,14 +15,13 @@ namespace Pinetime {
           ~Meter() override;
 
           bool Refresh() override;
-          bool OnButtonPushed() override;
 
         private:
           lv_style_t style_lmeter;
           lv_obj_t * lmeter;
 
           uint32_t value=0;
-          bool running = true;
+          
 
       };
     }