This is an automated email from the ASF dual-hosted git repository. fgreg pushed a change to branch SDAP-149 in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git.
from 404ecbe Fixing merge conflicts with master (#53)
add 18786fa Fixing merge conflicts (#54)
No new revisions were added by this update.
Summary of changes:
