diff options
| author | JF <jf@codingfield.com> | 2020-07-11 19:09:34 (GMT) |
|---|---|---|
| committer | JF <jf@codingfield.com> | 2020-07-11 19:09:34 (GMT) |
| commit | 64c14274fc2f025fc48d3df47a1640f08eb968cd (patch) | |
| tree | 262cf8b4e84c556748f42bbf778b48a68210921d /src/DisplayApp/DisplayApp.h | |
| parent | 0bcaf9c22d6183ba8072e10abb9da7aea578b8db (diff) | |
| parent | 6309719a62436fd746a7a8b228205e93b419ca26 (diff) | |
Merge branch 'develop'
# Conflicts:
# CMakeLists.txt
Diffstat (limited to 'src/DisplayApp/DisplayApp.h')
| -rw-r--r-- | src/DisplayApp/DisplayApp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/DisplayApp/DisplayApp.h b/src/DisplayApp/DisplayApp.h index b45a0be..36f9315 100644 --- a/src/DisplayApp/DisplayApp.h +++ b/src/DisplayApp/DisplayApp.h @@ -10,7 +10,6 @@ #include <Components/Brightness/BrightnessController.h> #include <Components/Ble/BleController.h> #include <Components/DateTime/DateTimeController.h> -#include "Fonts/lcdfont14.h" #include "../drivers/Cst816s.h" #include "LittleVgl.h" #include <date/date.h> |