GitHub user pluradj opened a pull request:

    https://github.com/apache/incubator-tinkerpop/pull/329

    use mockito-core instead of mockito-all to avoid hamcrest conflict

    https://issues.apache.org/jira/browse/TINKERPOP-1318

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/pluradj/incubator-tinkerpop TINKERPOP-1318

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-tinkerpop/pull/329.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 #329
    
----
commit 27eedc478b58cd9dee571960091a3c6505f2379e
Author: Jason Plurad <[email protected]>
Date:   2016-06-03T17:05:10Z

    use mockito-core instead of mockito-all to avoid hamcrest conflict

----


---
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.
---

Reply via email to