resolves conflicts

3 files changed, 4 insertions, 5 deletions

diff --git a/src/logging/DummyLogger.h b/src/logging/DummyLogger.h
index 8732dff..1b050b3 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 1c048f2..f8d95a6 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>
@@ -19,14 +19,13 @@ void NrfLogger::Init() {
 
 void NrfLogger::Process(void*) {
   NRF_LOG_INFO("Logger task started!");
-// Suppress endless loop diagnostic
+
 #pragma clang diagnostic push
 #pragma ide diagnostic ignored "EndlessLoop"
   while (true) {
     NRF_LOG_FLUSH();
     vTaskDelay(100); // Not good for power consumption, it will wake up every 100ms...
   }
-// Clear diagnostic suppression
 #pragma clang diagnostic pop
 }
 
diff --git a/src/logging/NrfLogger.h b/src/logging/NrfLogger.h
index 060c4e7..21183a3 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>