resolve conflict
All checks were successful
lint / lint (pull_request) Successful in 1m13s
test / test (pull_request) Successful in 2m2s

This commit is contained in:
2025-03-03 09:44:35 +03:00
parent 7ad92816ef
commit 36c52990ee
5 changed files with 12 additions and 8 deletions

View File

@@ -1,7 +1,7 @@
package grpc
import (
"go.unistack.org/micro/v3/codec"
"go.unistack.org/micro/v4/codec"
"google.golang.org/grpc"
"google.golang.org/grpc/encoding"
)