resolves conflicts

This commit is contained in:
SteveAmor
2022-01-02 21:49:18 +00:00
parent c5282f9454
commit 94561b2331
4 changed files with 3 additions and 7 deletions

View File

@@ -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"