[GitHub] brooklyn-server issue #834: Modular catalog.bom

[ahgittin]

Github user ahgittin commented on the issue:

    https://github.com/apache/brooklyn-server/pull/834
  
    @tbouron conflicts should be trivial to resolve if you `git merge` #842 
here (or rebase on that if that's easier)


---