diff options
| author | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 22:27:43 (GMT) |
|---|---|---|
| committer | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 22:27:43 (GMT) |
| commit | cc259b6a4ac93d507fa372a41ea653dedeb791ea (patch) | |
| tree | 3c8b8b937b2b91149003195679ce5acda1154c4d /src/components/settings | |
| parent | 94561b233136334c7507925b04a345adb0e6c769 (diff) | |
| parent | e0013e730448f4dc142e3610f970f22c807ac41e (diff) | |
resolves conflicts
Diffstat (limited to 'src/components/settings')
| -rw-r--r-- | src/components/settings/Settings.cpp | 2 | ||||
| -rw-r--r-- | src/components/settings/Settings.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/components/settings/Settings.cpp b/src/components/settings/Settings.cpp index 37c09f9..ef73ad1 100644 --- a/src/components/settings/Settings.cpp +++ b/src/components/settings/Settings.cpp @@ -1,4 +1,4 @@ -#include "Settings.h" +#include "components/settings/Settings.h" #include <cstdlib> #include <cstring> diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h index 0988601..f87b693 100644 --- a/src/components/settings/Settings.h +++ b/src/components/settings/Settings.h @@ -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 { |