Github user bhaisaab commented on the pull request:
https://github.com/apache/cloudstack/pull/1136#issuecomment-160336829
@remibergsma @DaanHoogland the merge conflict resolution did not include
the fix for master, I've merged #1119 to address that. `git diff master..4.6
ui/scripts` confirms that changes now.
---
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.
---
