diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-02-13 10:23:05 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-02-13 10:23:05 (GMT) |
| commit | 87d882b151acc7ef60fdb1a957649faf39e737c1 (patch) | |
| tree | 7d7586810c062d8fac37f16f208f6da77757a3ba /src/components/settings | |
| parent | d967efa19710f85cee846c59adbbe07d2a2189dc (diff) | |
| parent | 947ece0bc9ad90dd4c1fcd5875594a4a48eddd56 (diff) | |
Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime into mruss77-statusBarTimeFormat
# Conflicts:
# src/components/datetime/DateTimeController.cpp
Diffstat (limited to 'src/components/settings')
| -rw-r--r-- | src/components/settings/Settings.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h index 6de44aa..8d20f06 100644 --- a/src/components/settings/Settings.h +++ b/src/components/settings/Settings.h @@ -1,7 +1,6 @@ #pragma once #include <cstdint> #include <bitset> -#include "components/datetime/DateTimeController.h" #include "components/brightness/BrightnessController.h" #include "components/fs/FS.h" |