Github user swill commented on the pull request:
https://github.com/apache/cloudstack/pull/1433#issuecomment-206949345
@kiwiflyer they conflict in what sense? They change different lines of
code, so I don't expect git to have an issue with them. Can you clarify?
---
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.
---
