Conflict-resolved patches from Chromium 110.0.5481.24 to Chromium 110.0.5481.29

2023-01-25 07:42:33 +00:00
parent 7fc053ee1d
commit 73d01aef6a
1 changed files with 2 additions and 2 deletions
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index dbd5a9d05dc07b9dc9e20294e32330994404b32c..3358f0eef225ab7d184d0c7a5abded5887b73b7a 100644
+index 3dd6895a574bf5d41141e61e6d2655c29590fa54..3358f0eef225ab7d184d0c7a5abded5887b73b7a 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
@@ -1,4 +1,4 @@
 MAJOR=110
 -MINOR=0
 -BUILD=5481
-PATCH=24
+-PATCH=29
 +MINOR=1
 +BUILD=49
 +PATCH=59