From e8b1b94507fafabb0ae350ce37e11d47d2d73fbb Mon Sep 17 00:00:00 2001
From: ecarlett <eve.carletti@epfl.ch>
Date: Wed, 29 May 2024 15:37:19 +0200
Subject: [PATCH] fix src/displayapp/screens/settings/SettingWatchFace.h after
 merge mess

---
 src/displayapp/screens/settings/SettingWatchFace.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/displayapp/screens/settings/SettingWatchFace.h b/src/displayapp/screens/settings/SettingWatchFace.h
index ededf93f..359f12a6 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.h
+++ b/src/displayapp/screens/settings/SettingWatchFace.h
@@ -10,11 +10,7 @@
 #include "displayapp/screens/Symbols.h"
 #include "displayapp/screens/CheckboxList.h"
 #include "displayapp/screens/WatchFaceInfineat.h"
-<<<<<<< HEAD
-#include "displayapp/screens/WatchFaceInfineatColors.h"
-=======
->>>>>>> 9d04c32f (recovering manually changes to original Infineat)
-#include "displayapp/screens/WatchFaceMeow.h"
+include "displayapp/screens/WatchFaceMeow.h"
 #include "displayapp/screens/WatchFaceCasioStyleG7710.h"