diff options
| author | Avamander <avamander@gmail.com> | 2020-10-04 16:23:13 +0300 |
|---|---|---|
| committer | Avamander <avamander@gmail.com> | 2020-10-04 16:23:13 +0300 |
| commit | aba3d65e3aaed2dc728d64e7e73983d35da3903b (patch) | |
| tree | 2101336e75db14023daba541c156841a7e46b640 /src/displayapp/screens | |
| parent | 77f4d5448bb05287a3802ce3511817fc27a825ab (diff) | |
| parent | 1d96758acd4e3bf03c3e733a3a95d0deb74f6042 (diff) | |
Merge remote-tracking branch 'origin-origin/patch-3'
# Conflicts:
# src/systemtask/SystemTask.cpp
Diffstat (limited to 'src/displayapp/screens')
| -rw-r--r-- | src/displayapp/screens/Tab.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/displayapp/screens/Tab.cpp b/src/displayapp/screens/Tab.cpp index adc32578..44b806c0 100644 --- a/src/displayapp/screens/Tab.cpp +++ b/src/displayapp/screens/Tab.cpp @@ -1,13 +1,13 @@ #include <cstdio> #include <libs/date/includes/date/date.h> -#include <Components/DateTime/DateTimeController.h> +#include "components/datetime/DateTimeController.h" #include <Version.h> #include <libs/lvgl/src/lv_core/lv_obj.h> #include <libs/lvgl/src/lv_font/lv_font.h> #include <libs/lvgl/lvgl.h> #include <libraries/log/nrf_log.h> #include "Tab.h" -#include <DisplayApp/DisplayApp.h> +#include "displayapp/DisplayApp.h" using namespace Pinetime::Applications::Screens; |