conflicts

cosmos · Sep 27, 2024 · e333840 · e333840
1 parent daf1b0c
commit e333840
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 2,083 deletions.
diff --git a/server/v2/api/grpc/config.go b/server/v2/api/grpc/config.go
diff --git a/server/v2/api/grpc/server.go b/server/v2/api/grpc/server.go
diff --git a/server/v2/api/grpcgateway/config.go b/server/v2/api/grpcgateway/config.go