diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-11-28 13:53:03 +0100 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-11-28 13:53:03 +0100 |
| commit | 298f0f43357c5fd12c4498d74a35d71a0501ae1a (patch) | |
| tree | bdc0d80d48c215d395a7ee69bdd80c66cc8e2159 /src/logging | |
| 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/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> |