diff options
| author | Diego Miguel <dmlls@diegomiguel.me> | 2022-06-11 15:08:07 +0200 |
|---|---|---|
| committer | Diego Miguel <dmlls@diegomiguel.me> | 2022-06-11 16:57:24 +0200 |
| commit | 2ad51e6a98004f0f163c10231821ad4b2da70163 (patch) | |
| tree | 5326e318ea75401481275fcb54f3fe217335be24 /src/displayapp/screens/WatchFaceInfineat.h | |
| parent | 4e9fe3f36db3d833ac8f60d7f437c3018ebc82aa (diff) | |
Fix date alignment
Diffstat (limited to 'src/displayapp/screens/WatchFaceInfineat.h')
| -rw-r--r-- | src/displayapp/screens/WatchFaceInfineat.h | 5 |
1 files changed, 0 insertions, 5 deletions
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; |