diff options
| author | JF <JF002@users.noreply.github.com> | 2021-11-28 13:59:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-28 13:59:09 +0100 |
| commit | 583c7ee22fdf576490169643762240bf9bb6b375 (patch) | |
| tree | c0bca6afa9b570bb2f78370c1096131acafd32d0 /src/logging | |
| parent | f9613d28c06f96fbc93ccbc59a8f749bbc5f7fa5 (diff) | |
| parent | 4257073a02215e3f182d993765e4c5edef2d9845 (diff) | |
Merge branch 'develop' into motionservice_fix_typo_in_include
Diffstat (limited to 'src/logging')
| -rw-r--r-- | src/logging/DummyLogger.h | 2 | ||||
| -rw-r--r-- | src/logging/NrfLogger.cpp | 2 | ||||
| -rw-r--r-- | src/logging/NrfLogger.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/logging/DummyLogger.h b/src/logging/DummyLogger.h index 8732dff5..1b050b37 100644 --- a/src/logging/DummyLogger.h +++ b/src/logging/DummyLogger.h @@ -1,5 +1,5 @@ #pragma once -#include "Logger.h" +#include "logging/Logger.h" namespace Pinetime { namespace Logging { diff --git a/src/logging/NrfLogger.cpp b/src/logging/NrfLogger.cpp index 1c048f2c..ab54afe9 100644 --- a/src/logging/NrfLogger.cpp +++ b/src/logging/NrfLogger.cpp @@ -1,4 +1,4 @@ -#include "NrfLogger.h" +#include "logging/NrfLogger.h" #include <libraries/log/nrf_log.h> #include <libraries/log/nrf_log_ctrl.h> diff --git a/src/logging/NrfLogger.h b/src/logging/NrfLogger.h index 060c4e76..21183a3d 100644 --- a/src/logging/NrfLogger.h +++ b/src/logging/NrfLogger.h @@ -1,5 +1,5 @@ #pragma once -#include "Logger.h" +#include "logging/Logger.h" #include <FreeRTOS.h> #include <task.h> |