You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by co...@apache.org on 2023/11/15 18:56:59 UTC
(tinkerpop) branch 3.7-dev updated: CTR Fix unresolved merge conflict
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/3.7-dev by this push:
new 5e46f78edf CTR Fix unresolved merge conflict
5e46f78edf is described below
commit 5e46f78edfd8594115759ca533ddf095ce15a13a
Author: Cole-Greer <Co...@improving.com>
AuthorDate: Wed Nov 15 10:56:49 2023 -0800
CTR Fix unresolved merge conflict
---
gremlin-go/go.mod | 6 ------
1 file changed, 6 deletions(-)
diff --git a/gremlin-go/go.mod b/gremlin-go/go.mod
index 15993d2875..bc3ad693b9 100644
--- a/gremlin-go/go.mod
+++ b/gremlin-go/go.mod
@@ -40,12 +40,6 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.0 // indirect
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> 3.6-dev
golang.org/x/net v0.17.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
->>>>>>> 9e328e36f6 (CTR 8 squashed minor dependabots)
)