This is an automated email from the ASF dual-hosted git repository. daim pushed a change to branch OAK-10741 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
was cb6c9cdc9f OAK-10741 : handled merge 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.
