resolves conflicts

This commit is contained in:
SteveAmor
2022-01-02 22:27:43 +00:00
236 changed files with 4120 additions and 1555 deletions

View File

@@ -1,4 +1,4 @@
#include "Settings.h"
#include "components/settings/Settings.h"
#include <cstdlib>
#include <cstring>

View File

@@ -4,7 +4,6 @@
#include "components/datetime/DateTimeController.h"
#include "components/brightness/BrightnessController.h"
#include "components/fs/FS.h"
#include "drivers/Cst816s.h"
namespace Pinetime {
namespace Controllers {