From 0ecfbee4b7d2b96baa9b91c5ffa90e948d60f9b1 Mon Sep 17 00:00:00 2001
From: ecarlett <eve.carletti@epfl.ch>
Date: Wed, 29 May 2024 15:17:36 +0200
Subject: [PATCH] now I have the Meow Watchface AND the Infineat Watchface with
 alarm display

 interactive rebase in progress; onto b7a353cf
 Last commands done (3 commands done):
    pick 9d04c32f recovering manually changes to original Infineat
    pick 70f9025f now I have the Meow Watchface AND the Infineat Watchface with alarm display
 No commands remaining.
 You are currently rebasing branch 'my-custom-infinitime' on 'b7a353cf'.

 Changes to be committed:
	modified:   src/components/settings/Settings.h
---
 src/components/settings/Settings.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 57fedbcf..6d3100bd 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -48,11 +48,14 @@ namespace Pinetime {
       struct WatchFaceInfineat {
         bool showSideCover = true;
         bool showAlarmStatus = true;
+<<<<<<< HEAD
 	int colorIndex = 0;
       };
  
       struct WatchFaceInfineatColors {
         bool showSideCover = true;
+=======
+>>>>>>> 70f9025f (now I have the Meow Watchface AND the Infineat Watchface with alarm display)
         int colorIndex = 0;
       };
 <<<<<<< HEAD