You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by rf...@apache.org on 2019/07/04 21:20:08 UTC

[maven-jxr] 06/06: Fix merge conflicts

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

rfscholte pushed a commit to branch JXR-142
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git

commit 4cd68c6c84f8dfea59b81c03343b86d822f604e4
Merge: 8b38211 64c867c
Author: rfscholte <rf...@apache.org>
AuthorDate: Thu Jul 4 23:20:10 2019 +0200

    Fix merge conflicts