fixed merge conflict

SeldonIO · Jun 16, 2020 · 5d2a533 · 5d2a533
1 parent 65dfd7e
commit 5d2a533
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/executor/go.mod b/executor/go.mod
@@ -23,8 +23,7 @@ require (
 	github.com/tensorflow/tensorflow/tensorflow/go/core v0.0.0-00010101000000-000000000000
 	github.com/uber/jaeger-client-go v2.21.1+incompatible
 	github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
-	golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
-	google.golang.org/appengine v1.6.5
+	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
 	google.golang.org/grpc v1.28.0
 	gotest.tools v2.2.0+incompatible
 	k8s.io/api v0.17.2