This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MPLUGIN-336
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git

commit 2aa8cbbccdeac3536d235ac0ea5c21942b570cf7
Merge: a9dafa6 d9ffdaf
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Sun Sep 30 20:37:09 2018 +0200

    [MPLUGIN-336]| resolve conflicts

 maven-plugin-plugin/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

Reply via email to