Github user remibergsma commented on the pull request:
https://github.com/apache/cloudstack/pull/897#issuecomment-153008102
This PR has a conflict now, can someone resolve it?
```
From https://github.com/apache/cloudstack
* [new ref] refs/pull/987/head -> pr/987
Auto-merging server/src/com/cloud/network/router/CommandSetupHelper.java
Auto-merging
plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
Auto-merging engine/schema/src/com/cloud/network/dao/NetworkVO.java
Auto-merging api/src/com/cloud/agent/api/to/LoadBalancerTO.java
CONFLICT (content): Merge conflict in
api/src/com/cloud/agent/api/to/LoadBalancerTO.java
Automatic merge failed; fix conflicts and then commit the result.
ERROR: Merge failed, aborting.
```
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
