This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit e3b97c8fb3a26a7604234b93c3c4a93ed7227cc5
Author: Daniel Kulp <[email protected]>
AuthorDate: Tue Apr 25 13:10:18 2023 -0400

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3ac96d7cca..c25fd52ad7 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -125,7 +125,6 @@ B e277f0c2bb0e09b8dc550e0eddcda9d8362eb09a
 B e476d83ee9ca5c01d6098a14bd4d5d9bc847eca7
 B e4a3e2493825ebae748ef8cd6e2f8c148fd4303d
 B e7157bb371804a15e3c78351c9b506776bcbdeda
-B f35d8ae18b51088f7238a0af6b9caaca4da8ef95
 B e8ea9fbbff58bde7dac7c8336a25c9bb92bad62e
 B ea334cd2a0fbe25d570138a7c937c64c5e304a36
 B ea7d512f753c5db9be260f47f68fd134c013490b
@@ -299,7 +298,6 @@ M 60e202dde133752bdf2de35bb8b0ca3dda6113fa
 M 60f00a123ee85f6865e24ee35a91e4ec6eced62c
 M 61884fa661644d6863ce12d6d963b820cbdbce0b
 M 634758b2e0352a489e39cb96c9b834369fcb444f
-M 61884fa661644d6863ce12d6d963b820cbdbce0b
 M 63a2c2bbf4dcba37bd8fe669d35203f8eb0d019b
 M 647408469988d9e244086efc839b2f6ab5e42cd7
 M 64a534d641f55b5cf05500a3ff092f73cf041f8d
@@ -364,7 +362,6 @@ M 9155af11145a456646249d05178cc3ef67ecd072
 M 926d4b431b79dac14f2dd7bff2376eb8a95ddf41
 M 93b3b94c7420c37db48a6783f340103bfe4a680a
 M 95ce55cf1d7a405c209d3a858a82b4279f24bd91
-M 93b3b94c7420c37db48a6783f340103bfe4a680a
 M 967ff56b0d1c4d0535b3bdbca357c03631b41288
 M 96a2e7f27fde6ebdffd511ce69120adfff7b9dcb
 M 96e71237bae2eb987a5fbe67d21e9e1e19f2d158
@@ -410,8 +407,8 @@ M afa9b3aea81c9dbfe27809ed4bdcccc9bd405067
 M b065acb970fd12f4a338b37d1e513e0d37ede7ef
 M b12b9319e5b563814f20879f29e12fbe25a95258
 M b15e3580e8f8692b2ffd51e6b2c44ce9dd8a5730
-M b1c647659ad5df3c21e83b670fb7ea0ff3dbe889
 M b1a512265c4a646912ec057eff24eb269e7bfe26
+M b1c647659ad5df3c21e83b670fb7ea0ff3dbe889
 M b207c718e84bed8120bb114f1d79f575094c3a14
 M b2ee30f1728dba63ebf27b2bbae2836d633ccb42
 M b49846c8c4275fe7758449e45e473c1a1ab3bdd6
@@ -450,7 +447,6 @@ M ca46bebe06bc2732907e476bfe6116f09fbe1eb4
 M cb00226811f39d36b4f91106be94fd889c426005
 M ce035b5bb81fe65f18b352d4164b18e75b03fe0e
 M ceaef931fcbe62d64007a371abc38409e15d5dd6
-M ce035b5bb81fe65f18b352d4164b18e75b03fe0e
 M cefafc093f527af09f51ead881d4af57dd2031b4
 M cf09a8532ce31a9453f1628c1d0d7082d5ec3a31
 M cf1dc0bc288382c6676ced1166ebefd2c5ae3464
@@ -470,6 +466,7 @@ M d849512da6499d00e3e84eb60733a0343a473b44
 M d906a253018c37b36621973a0f4c8b4322cbac64
 M d9506070f73019bf4430e8c36287928c7efbf731
 M d9bb99deb7dc23de7986ef7b95c54aaec90316be
+M db80012a672d2049318a11e4443ab8ed4cf7c885
 M dc5e818f5a8387e7009bc4471b5a032428cfb3cc
 M dd4c06bd2dffc77aa3f6a0e4ecd62e05803354e5
 M ddcc93f12758a13cb4ce98c3d76a68f207ba674f
@@ -478,8 +475,8 @@ M ded51b955c67bc232e961200b6dc6b59c07bdf32
 M df7fe8b569a7b8825ab6181a3ea0aab2a2493858
 M e0da0e4af33fa0d5e0ccad3093eee26eb3be140c
 M e12d85ba730fcda72afd61652c5c8e708d6d0456
-M e277f0c2bb0e09b8dc550e0eddcda9d8362eb09a
 M e24896930283395f953143d6d517aea6ad3675da
+M e277f0c2bb0e09b8dc550e0eddcda9d8362eb09a
 M e2c881bfc0d8a95424f0a5343ab0b1bdbd16eb0f
 M e323b0724a6899e675ff020e70bc7119ab47c04f
 M e493398886b19b1a6dd75f2bc99a2914ddb63441

Reply via email to