This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new 69d5463c17 Fix post merge issue (conflicts resolution)
69d5463c17 is described below
commit 69d5463c179a20300ab6205edb78207e58a5d49d
Author: Andriy Redko <[email protected]>
AuthorDate: Fri Jul 4 17:04:33 2025 -0400
Fix post merge issue (conflicts resolution)
---
distribution/src/main/release/samples/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index 6531523e53..a1d0345b06 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -227,7 +227,6 @@
<version>3.5.3</version>
</plugin>
<plugin>
-<<<<<<< HEAD
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.5.0</version>
