Merge branch 'develop' into notification-title

# Conflicts:
#	src/displayapp/screens/Notifications.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 964ccbf..a516365 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -33,7 +33,7 @@ namespace Pinetime {
           ~Clock() override;
 
           bool Refresh() override;
-          bool OnButtonPushed() override;
+          
           bool OnTouchEvent(TouchEvents event) override;
 
         private:
@@ -54,7 +54,7 @@ namespace Pinetime {
           //std::unique_ptr<Screen> WatchFaceMinimalScreen();
           //std::unique_ptr<Screen> WatchFaceCustomScreen();
 
-          bool running = true;
+          
 
       };
     }