diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-11-28 12:53:03 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-11-28 12:53:03 (GMT) |
| commit | 298f0f43357c5fd12c4498d74a35d71a0501ae1a (patch) | |
| tree | bdc0d80d48c215d395a7ee69bdd80c66cc8e2159 /src/displayapp/DisplayApp.cpp | |
| parent | d5e8e3ca44e998511907d1ec74c98c06c2e542b8 (diff) | |
| parent | 3a41bff9eaf9cbae6d3864664ad08859ec2d2c44 (diff) | |
Merge branch 'restructure_includes' of https://github.com/NeroBurner/InfiniTime into NeroBurner-restructure_includes
# Conflicts:
# doc/contribute.md
# src/displayapp/screens/BatteryInfo.h
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
| -rw-r--r-- | src/displayapp/DisplayApp.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 63afec1..38ce930 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -1,9 +1,9 @@ -#include "DisplayApp.h" +#include "displayapp/DisplayApp.h" #include <libraries/log/nrf_log.h> -#include <displayapp/screens/HeartRate.h> -#include <displayapp/screens/Motion.h> -#include <displayapp/screens/Timer.h> -#include <displayapp/screens/Alarm.h> +#include "displayapp/screens/HeartRate.h" +#include "displayapp/screens/Motion.h" +#include "displayapp/screens/Timer.h" +#include "displayapp/screens/Alarm.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" #include "components/datetime/DateTimeController.h" |