[tinkerpop] branch master updated: fix merge conflict

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

valentyn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


The following commit(s) were added to refs/heads/master by this push:
     new 9a4dab9014 fix merge conflict
9a4dab9014 is described below

commit 9a4dab901412098cb8ead375029b729d7cca99dc
Author: Valentyn Kahamlyk <vk...@users.noreply.github.com>
AuthorDate: Fri Jan 13 17:11:32 2023 -0800

    fix merge conflict
---
 .../src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
index e6ed25b99d..0793046f8d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
@@ -26,7 +26,7 @@ import java.io.IOException;
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
 public final class Gremlin {
-    private static final String version;
+    private static String version;
 
     static {
         try {