[GitHub] brooklyn-ui pull request #60: Allow UI modules to actively resolve conflicts

[asfgit]

Github user asfgit closed the pull request at:

    https://github.com/apache/brooklyn-ui/pull/60


---