On Fri, May 29, 2020 at 9:05 PM <ma...@apache.org> wrote: > > +<<<<<<< HEAD > +======= > + > +>>>>>>> 5db7d814d0... Switch to Maven Resolver Ant tasks > <target name="maven-deploy" depends="init-maven"> > > The CI run complained and indeed there's a merge conflict here.
Rémy
