This is an automated email from the ASF dual-hosted git repository. rkk pushed a change to branch master-conflicts in repository https://gitbox.apache.org/repos/asf/sdap-nexus.git
was f366867 Merge remote-tracking branch 'origin/develop' into
master-conflicts
The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.
