@spmallette Ok, this happened because my `tp34` is behind from `upstream`. I updated `tp34` and rebased this PR onto it, now the conflict is gone. It should be good now.
[ Full content available at: https://github.com/apache/tinkerpop/pull/1228 ] This message was relayed via gitbox.apache.org for [email protected]
