resolve conflict

2025-03-03 09:44:35 +03:00
parent 7ad92816ef
commit 36c52990ee
5 changed files with 12 additions and 8 deletions
--- a/codec_test.go
+++ b/codec_test.go
@@ -2,9 +2,10 @@ package grpc

 import (
 	"context"
-	"go.unistack.org/micro/v3/codec"
-	gmetadata "google.golang.org/grpc/metadata"
 	"testing"
+
+	"go.unistack.org/micro/v4/codec"
+	gmetadata "google.golang.org/grpc/metadata"
 )

 type mockStream struct {