CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime into mruss77-statusBarTimeFormat

Browse Source 
# Conflicts:
#	src/components/datetime/DateTimeController.cpp
This commit is contained in:
Jean-François Milants
2022-02-13 11:23:05 +01:00
parent d967efa197 947ece0bc9
commit 87d882b151
6 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/settings/Settings.h
View File

@@ -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"