This is an automated email from the ASF dual-hosted git repository. poorejc pushed a change to branch FLAGON-434 in repository https://gitbox.apache.org/repos/asf/incubator-flagon-useralejs.git.
was a382e91 [FLAGON-434] resolving 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.
