From 94561b233136334c7507925b04a345adb0e6c769 Mon Sep 17 00:00:00 2001
From: SteveAmor <SteveAmor@users.noreply.github.com>
Date: Sun, 2 Jan 2022 21:49:18 +0000
Subject: resolves conflicts

---
 src/displayapp/screens/settings/SettingChimes.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/displayapp/screens/settings/SettingChimes.cpp')

diff --git a/src/displayapp/screens/settings/SettingChimes.cpp b/src/displayapp/screens/settings/SettingChimes.cpp
index dc06f4d8..0f008802 100644
--- a/src/displayapp/screens/settings/SettingChimes.cpp
+++ b/src/displayapp/screens/settings/SettingChimes.cpp
@@ -1,4 +1,4 @@
-#include "SettingChimes.h"
+#include "displayapp/screens/settings/SettingChimes.h"
 #include <lvgl/lvgl.h>
 #include "displayapp/DisplayApp.h"
 #include "displayapp/screens/Screen.h"
-- 
cgit v1.2.3-70-g09d2