From 2ad51e6a98004f0f163c10231821ad4b2da70163 Mon Sep 17 00:00:00 2001
From: Diego Miguel <dmlls@diegomiguel.me>
Date: Sat, 11 Jun 2022 15:08:07 +0200
Subject: Fix date alignment

---
 src/displayapp/screens/WatchFaceInfineat.h | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/displayapp/screens/WatchFaceInfineat.h')

diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h
index b6f5f08c..9541f2ad 100644
--- a/src/displayapp/screens/WatchFaceInfineat.h
+++ b/src/displayapp/screens/WatchFaceInfineat.h
@@ -100,14 +100,9 @@ namespace Pinetime {
         lv_obj_t* labelHour;
         lv_obj_t* labelMinutes;
         lv_obj_t* labelTimeAmPm;
-<<<<<<< HEAD
         lv_obj_t* dateContainer;
         lv_obj_t* labelDateDay;
         lv_obj_t* labelDateNum;
-=======
-        lv_obj_t* dateBleContainer;
-        lv_obj_t* labelDate;
->>>>>>> 5e798689 (Better alignment of the date label)
         lv_obj_t* bleIcon;
         lv_obj_t* stepIcon;
         lv_obj_t* stepValue;
-- 
cgit v1.2.3-70-g09d2