Merge branch 'develop' of github.com:JF002/Pinetime into develop

# Conflicts:
#	src/main.cpp
#	src/systemtask/SystemTask.h

1 files changed, 2 insertions, 1 deletions

diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h
index 55ed45e3..f717a220 100644
--- a/src/displayapp/screens/Tile.h
+++ b/src/displayapp/screens/Tile.h
@@ -5,6 +5,7 @@
 #include <memory>
 #include "Screen.h"
 #include "../Apps.h"
+#include "components/settings/Settings.h"
 
 namespace Pinetime {
   namespace Applications {
@@ -16,7 +17,7 @@ namespace Pinetime {
             Pinetime::Applications::Apps application;
           };
 
-          explicit Tile(DisplayApp* app, std::array<Applications, 6>& applications);
+          explicit Tile(uint8_t screenID, DisplayApp* app, Controllers::Settings& settingsController, std::array<Applications, 6>& applications);
           ~Tile() override;
 
           bool Refresh() override;