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/Clock.h b/src/displayapp/screens/Clock.h
index 95968c5c..1a4e0ebd 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -35,7 +35,7 @@ namespace Pinetime {
           ~Clock() override;
 
           bool Refresh() override;
-          bool OnButtonPushed() override;
+          
           bool OnTouchEvent(TouchEvents event) override;
 
         private:
@@ -57,7 +57,7 @@ namespace Pinetime {
           //std::unique_ptr<Screen> WatchFaceMinimalScreen();
           //std::unique_ptr<Screen> WatchFaceCustomScreen();
 
-          bool running = true;
+          
 
       };
     }