Github user GERey commented on the pull request:
https://github.com/apache/incubator-usergrid/pull/225#issuecomment-130467710
Hello! If you could update this PR to address the conflicts I would be more
than happy to accept the PR. Thanks!
---
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.
---
