diff options
| author | JF <jf@codingfield.com> | 2020-10-27 21:55:18 +0100 |
|---|---|---|
| committer | JF <jf@codingfield.com> | 2020-10-27 21:55:18 +0100 |
| commit | 7de43a16608e599369867cb3cfa7d5776a5b6380 (patch) | |
| tree | 1750edfed02f547102e468eca485caab3b08e98d /src/graphics.cpp | |
| parent | 5983e33b8d7702800dc91a3229b9a7cee75eb006 (diff) | |
| parent | c5bf09d21b2ed8e2435ec625e351594f58713924 (diff) | |
Fix conflicts
Diffstat (limited to 'src/graphics.cpp')
| -rw-r--r-- | src/graphics.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/graphics.cpp b/src/graphics.cpp index 9373a9b6..288b5e9a 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -11,15 +11,15 @@ #include <libraries/gpiote/app_gpiote.h> #include <hal/nrf_wdt.h> #include <cstring> -#include <Components/Gfx/Gfx.h> +#include <components/gfx/Gfx.h> #include <drivers/St7789.h> -#include <Components/Brightness/BrightnessController.h> +#include <components/brightness/BrightnessController.h> #if NRF_LOG_ENABLED -#include "Logging/NrfLogger.h" +#include "logging/NrfLogger.h" Pinetime::Logging::NrfLogger logger; #else -#include "Logging/DummyLogger.h" +#include "logging/DummyLogger.h" Pinetime::Logging::DummyLogger logger; #endif |