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/Notifications.h b/src/displayapp/screens/Notifications.h
index 028a3780..0d54ddbe 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -20,7 +20,6 @@ namespace Pinetime {
           ~Notifications() override;
 
           bool Refresh() override;
-          bool OnButtonPushed() override;
           bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
 
         class NotificationItem {
@@ -55,7 +54,7 @@ namespace Pinetime {
         };
 
         private:
-          bool running = true;
+          
 
           struct NotificationData {
             const char* title;