From dbc1dcfbdfe97f3a9ae69b50e80b471d97b48bdf Mon Sep 17 00:00:00 2001
From: ecarlett <eve.carletti@epfl.ch>
Date: Wed, 29 May 2024 15:35:21 +0200
Subject: [PATCH] fix src/displayapp/UserApps.h after merge mess

---
 src/displayapp/UserApps.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/displayapp/UserApps.h b/src/displayapp/UserApps.h
index f4fb97ba..a0e41f72 100644
--- a/src/displayapp/UserApps.h
+++ b/src/displayapp/UserApps.h
@@ -12,10 +12,6 @@
 #include "displayapp/screens/WatchFaceAnalog.h"
 #include "displayapp/screens/WatchFaceCasioStyleG7710.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/WatchFacePineTimeStyle.h"
 #include "displayapp/screens/WatchFaceTerminal.h"