This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/ci-friendly-complex-expressions
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 0d7fee5c576813d8b01cb59e5e0a5d52f166ae94
Author: Mikhail Kolesnikov <m.kolesni...@id-mt.ru>
AuthorDate: Wed Nov 29 20:20:32 2023 +0300
MRELEASE-1109 patch JDomModel
---
.../pom-with-parent-and-cifriendly-expressions/expected-pom.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-cifriendly-expressions/expected-pom.xml
b/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-cifriendly-expressions/expected-pom.xml
index 2f68ea26..00543238 100644
---
a/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-cifriendly-expressions/expected-pom.xml
+++
b/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-cifriendly-expressions/expected-pom.xml
@@ -31,7 +31,10 @@
<properties>
<revision>1.0</revision>
+<<<<<<< Upstream, based on master
<changelist></changelist>
+=======
+>>>>>>> ab5c8d5 MRELEASE-1109 patch JDomModel
</properties>
<modules>
