This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 8563619 Fix merge
8563619 is described below
commit 8563619aa8c45bdd891d49ba2cdd16442db9d712
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 29 20:17:19 2020 +0100
Fix merge
---
res/maven/mvn-pub.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 010a00c..17d64a9 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -39,8 +39,6 @@
</taskdef>
</target>
-<<<<<<< HEAD
-=======
<target name="maven-install" depends="init-maven">
<!--cleanup-->
<delete file="${pom}.tmp"/>
@@ -80,7 +78,6 @@
</sequential>
</macrodef>
->>>>>>> 5db7d814d0... Switch to Maven Resolver Ant tasks
<target name="maven-deploy" depends="init-maven">
<!--cleanup-->
<delete file="${pom}.tmp"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
