Merge branch 'tp33'

Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d16153db
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d16153db
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d16153db

Branch: refs/heads/master
Commit: d16153db525a67b014db738e1c97ba68b8068f8d
Parents: c811ee9 5d71dc1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 18 16:06:38 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jun 18 16:06:38 2018 -0400

----------------------------------------------------------------------
 gremlin-python/src/main/jython/tests/conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to