From 684c51686f31fe3052ebf0b5bd290de04cbf9b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Mert=20Y=C4=B1ld=C4=B1ran?= Date: Sun, 1 May 2022 06:51:43 -0700 Subject: [PATCH] Remove the obsolete `replace` statements that are artifacts of a merge conflict (#1061) --- tap/api/go.mod | 4 ---- tap/extensions/amqp/go.mod | 2 -- tap/extensions/http/go.mod | 2 -- tap/extensions/kafka/go.mod | 2 -- tap/extensions/redis/go.mod | 2 -- tap/go.mod | 2 -- 6 files changed, 14 deletions(-) diff --git a/tap/api/go.mod b/tap/api/go.mod index e5691932b..1c43b3e5a 100644 --- a/tap/api/go.mod +++ b/tap/api/go.mod @@ -3,7 +3,3 @@ module github.com/up9inc/mizu/tap/api go 1.17 require github.com/google/martian v2.1.0+incompatible - -replace github.com/up9inc/mizu/logger v0.0.0 => ../../logger - -replace github.com/up9inc/mizu/shared v0.0.0 => ../../shared diff --git a/tap/extensions/amqp/go.mod b/tap/extensions/amqp/go.mod index 2ddbf94ac..715f96321 100644 --- a/tap/extensions/amqp/go.mod +++ b/tap/extensions/amqp/go.mod @@ -15,5 +15,3 @@ require ( ) replace github.com/up9inc/mizu/tap/api v0.0.0 => ../../api - -replace github.com/up9inc/mizu/logger v0.0.0 => ../../../logger diff --git a/tap/extensions/http/go.mod b/tap/extensions/http/go.mod index 6a87e221a..fc93b8fac 100644 --- a/tap/extensions/http/go.mod +++ b/tap/extensions/http/go.mod @@ -18,5 +18,3 @@ require ( ) replace github.com/up9inc/mizu/tap/api v0.0.0 => ../../api - -replace github.com/up9inc/mizu/logger v0.0.0 => ../../../logger diff --git a/tap/extensions/kafka/go.mod b/tap/extensions/kafka/go.mod index 6a8ac98a7..34ef14433 100644 --- a/tap/extensions/kafka/go.mod +++ b/tap/extensions/kafka/go.mod @@ -22,5 +22,3 @@ require ( ) replace github.com/up9inc/mizu/tap/api v0.0.0 => ../../api - -replace github.com/up9inc/mizu/logger v0.0.0 => ../../../logger diff --git a/tap/extensions/redis/go.mod b/tap/extensions/redis/go.mod index d8ba83b26..82bd16d51 100644 --- a/tap/extensions/redis/go.mod +++ b/tap/extensions/redis/go.mod @@ -15,5 +15,3 @@ require ( ) replace github.com/up9inc/mizu/tap/api v0.0.0 => ../../api - -replace github.com/up9inc/mizu/logger v0.0.0 => ../../../logger diff --git a/tap/go.mod b/tap/go.mod index d51f7af9b..150fe1477 100644 --- a/tap/go.mod +++ b/tap/go.mod @@ -38,5 +38,3 @@ require ( replace github.com/up9inc/mizu/logger v0.0.0 => ../logger replace github.com/up9inc/mizu/tap/api v0.0.0 => ./api - -replace github.com/up9inc/mizu/shared v0.0.0 => ../shared