This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch fix/MEAR-303-ejb-client-missing
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git
at 281e575 Resolve merge conflicts
This branch includes the following new commits:
new 281e575 Resolve merge conflicts
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
