Skip to content

Commit 329ddf3

Browse files
LeanBitLabLeanBitLab
committed
chore: remove jules-merge-conflicts workflow to fix CI failure
1 parent f6c9e29 commit 329ddf3

12 files changed

Lines changed: 22 additions & 45 deletions

‎.github/workflows/jules-merge-conflicts.yml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎app/src/main/res/layout/widget_layout.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
android:orientation="horizontal"
3434
android:layout_alignParentTop="true"
3535
android:layout_alignParentStart="true"
36-
android:gravity="top">
36+
android:gravity="center_vertical">
3737
<TextClock
3838
android:id="@+id/clock_time"
3939
android:layout_width="wrap_content"
@@ -143,7 +143,7 @@
143143
android:orientation="horizontal"
144144
android:layout_below="@id/time_container"
145145
android:layout_alignParentStart="true"
146-
android:gravity="top">
146+
android:gravity="center_vertical">
147147
<TextClock
148148
android:id="@+id/clock_date"
149149
android:layout_width="wrap_content"

‎app/src/main/res/layout/widget_layout_black.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
android:orientation="horizontal"
3434
android:layout_alignParentTop="true"
3535
android:layout_alignParentStart="true"
36-
android:gravity="top">
36+
android:gravity="center_vertical">
3737
<TextClock
3838
android:id="@+id/clock_time"
3939
android:layout_width="wrap_content"
@@ -144,7 +144,7 @@
144144
android:orientation="horizontal"
145145
android:layout_below="@id/time_container"
146146
android:layout_alignParentStart="true"
147-
android:gravity="top">
147+
android:gravity="center_vertical">
148148
<TextClock
149149
android:id="@+id/clock_date"
150150
android:layout_width="wrap_content"

‎app/src/main/res/layout/widget_layout_condensed.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
android:orientation="horizontal"
3434
android:layout_alignParentTop="true"
3535
android:layout_alignParentStart="true"
36-
android:gravity="top">
36+
android:gravity="center_vertical">
3737
<TextClock
3838
android:id="@+id/clock_time"
3939
android:layout_width="wrap_content"
@@ -144,7 +144,7 @@
144144
android:orientation="horizontal"
145145
android:layout_below="@id/time_container"
146146
android:layout_alignParentStart="true"
147-
android:gravity="top">
147+
android:gravity="center_vertical">
148148
<TextClock
149149
android:id="@+id/clock_date"
150150
android:layout_width="wrap_content"

‎app/src/main/res/layout/widget_layout_condensed_light.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
android:orientation="horizontal"
3434
android:layout_alignParentTop="true"
3535
android:layout_alignParentStart="true"
36-
android:gravity="top">
36+
android:gravity="center_vertical">
3737
<TextClock
3838
android:id="@+id/clock_time"
3939
android:layout_width="wrap_content"
@@ -144,7 +144,7 @@
144144
android:orientation="horizontal"
145145
android:layout_below="@id/time_container"
146146
android:layout_alignParentStart="true"
147-
android:gravity="top">
147+
android:gravity="center_vertical">
148148
<TextClock
149149
android:id="@+id/clock_date"
150150
android:layout_width="wrap_content"

‎app/src/main/res/layout/widget_layout_cursive.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
android:orientation="horizontal"
3434
android:layout_alignParentTop="true"
3535
android:layout_alignParentStart="true"
36-
android:gravity="top">
36+
android:gravity="center_vertical">
3737
<TextClock
3838
android:id="@+id/clock_time"
3939
android:layout_width="wrap_content"
@@ -144,7 +144,7 @@
144144
android:orientation="horizontal"
145145
android:layout_below="@id/time_container"
146146
android:layout_alignParentStart="true"
147-
android:gravity="top">
147+
android:gravity="center_vertical">
148148
<TextClock
149149
android:id="@+id/clock_date"
150150
android:layout_width="wrap_content"

‎app/src/main/res/layout/widget_layout_light.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
android:orientation="horizontal"
3434
android:layout_alignParentTop="true"
3535
android:layout_alignParentStart="true"
36-
android:gravity="top">
36+
android:gravity="center_vertical">
3737
<TextClock
3838
android:id="@+id/clock_time"
3939
android:layout_width="wrap_content"
@@ -144,7 +144,7 @@
144144
android:orientation="horizontal"
145145
android:layout_below="@id/time_container"
146146
android:layout_alignParentStart="true"
147-
android:gravity="top">
147+
android:gravity="center_vertical">
148148
<TextClock
149149
android:id="@+id/clock_date"
150150
android:layout_width="wrap_content"

‎app/src/main/res/layout/widget_layout_medium.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
android:orientation="horizontal"
3434
android:layout_alignParentTop="true"
3535
android:layout_alignParentStart="true"
36-
android:gravity="top">
36+
android:gravity="center_vertical">
3737
<TextClock
3838
android:id="@+id/clock_time"
3939
android:layout_width="wrap_content"
@@ -144,7 +144,7 @@
144144
android:orientation="horizontal"
145145
android:layout_below="@id/time_container"
146146
android:layout_alignParentStart="true"
147-
android:gravity="top">
147+
android:gravity="center_vertical">
148148
<TextClock
149149
android:id="@+id/clock_date"
150150
android:layout_width="wrap_content"

‎app/src/main/res/layout/widget_layout_mono.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
android:orientation="horizontal"
3434
android:layout_alignParentTop="true"
3535
android:layout_alignParentStart="true"
36-
android:gravity="top">
36+
android:gravity="center_vertical">
3737
<TextClock
3838
android:id="@+id/clock_time"
3939
android:layout_width="wrap_content"
@@ -144,7 +144,7 @@
144144
android:orientation="horizontal"
145145
android:layout_below="@id/time_container"
146146
android:layout_alignParentStart="true"
147-
android:gravity="top">
147+
android:gravity="center_vertical">
148148
<TextClock
149149
android:id="@+id/clock_date"
150150
android:layout_width="wrap_content"

‎app/src/main/res/layout/widget_layout_serif.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
android:orientation="horizontal"
3434
android:layout_alignParentTop="true"
3535
android:layout_alignParentStart="true"
36-
android:gravity="top">
36+
android:gravity="center_vertical">
3737
<TextClock
3838
android:id="@+id/clock_time"
3939
android:layout_width="wrap_content"
@@ -144,7 +144,7 @@
144144
android:orientation="horizontal"
145145
android:layout_below="@id/time_container"
146146
android:layout_alignParentStart="true"
147-
android:gravity="top">
147+
android:gravity="center_vertical">
148148
<TextClock
149149
android:id="@+id/clock_date"
150150
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)