diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-03-07 08:44:14 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-03-07 08:44:14 +0100 |
commit | 9f67e6f6525bd4071609ff9edd6ce132d7ca1464 (patch) | |
tree | 65b2dc22bb257c6dd4fc8be77762173b564c340c /src/displayapp/DisplayAppRecovery.h | |
parent | 740b3d7b58dd92a6a6f99620a090ae4f05c03299 (diff) | |
parent | ada942535718d48eec37cca4f50d678e7201dc67 (diff) |
Merge branch 'develop' into recovery-firmware
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/DisplayApp.h
# src/systemtask/SystemTask.cpp
# src/systemtask/SystemTask.h
Diffstat (limited to 'src/displayapp/DisplayAppRecovery.h')
-rw-r--r-- | src/displayapp/DisplayAppRecovery.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/displayapp/DisplayAppRecovery.h b/src/displayapp/DisplayAppRecovery.h index 3e865ae4..bcabea3a 100644 --- a/src/displayapp/DisplayAppRecovery.h +++ b/src/displayapp/DisplayAppRecovery.h @@ -15,7 +15,6 @@ #include "drivers/Cst816s.h" #include <date/date.h> #include "displayapp/screens/Clock.h" -#include "displayapp/screens/Modal.h" #include <drivers/Watchdog.h> #include "TouchEvents.h" #include "Apps.h" |