This is an automated email from the ASF dual-hosted git repository. valentyn pushed a commit to branch 3.7-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 72fdc23acf7b19b0eb401acca7a0a3e70225153b Merge: 45b1ace623 51dbabf796 Author: Valentyn Kahamlyk <valentyn.kaham...@improving.com> AuthorDate: Thu Jan 18 09:24:57 2024 -0800 resolve merge conflict .../gremlin/process/traversal/translator/PythonTranslator.java | 5 ++--- gremlin-python/src/main/python/gremlin_python/process/traversal.py | 4 ++-- gremlin-python/src/main/python/radish/gremlin.py | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-)