GitHub user peterj99a opened a pull request:
https://github.com/apache/usergrid/pull/593
Revert "Remove dependency conflicts"
This reverts commit ae14dc911e8fa7e97cbba839e7700159d5b2be42.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/peterj99a/usergrid pj_3.0.0_experimental
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/usergrid/pull/593.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #593
----
commit d66a525a32bc58774f0a5511c87df328942a63a5
Author: Peter Johnson <[email protected]>
Date: 2017-11-30T05:11:24Z
Revert "Remove dependency conflicts"
This reverts commit ae14dc911e8fa7e97cbba839e7700159d5b2be42.
----
---
