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/Brightness.h b/src/displayapp/screens/Brightness.h
index 7aee968e..60b33cfd 100644
--- a/src/displayapp/screens/Brightness.h
+++ b/src/displayapp/screens/Brightness.h
@@ -13,12 +13,12 @@ namespace Pinetime {
           Brightness(DisplayApp* app, Controllers::BrightnessController& brightness);
           ~Brightness() override;
           bool Refresh() override;
-          bool OnButtonPushed() override;
+          
           bool OnTouchEvent(TouchEvents event) override;
 
           void OnValueChanged();
         private:
-          bool running = true;
+          
           Controllers::BrightnessController& brightness;
 
           lv_obj_t * slider_label;