Re: [tomcat] branch 8.5.x updated: Switch to Maven Resolver Ant tasks

2020-05-29 Thread Rémy Maucherat
On Fri, May 29, 2020 at 9:05 PM wrote: > > +<<< HEAD > +=== > + > +>>> 5db7d814d0... Switch to Maven Resolver Ant tasks > > > The CI run complained and indeed there's a merge conflict here. Rémy

[tomcat] branch 8.5.x updated: Switch to Maven Resolver Ant tasks

2020-05-29 Thread markt
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 e4ba820 Switch to Maven Resolver Ant tasks