Github user rafaelweingartner commented on the pull request:
https://github.com/apache/cloudstack/pull/943#issuecomment-160705037
@DaanHoogland , where did you see the merge conflict Daan ? I did not find
it.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
