fix: merge conflicts · 5079b99e97 - open-im-server - Gitea: Git with a cup of tea

IM/open-im-server

mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-14 14:05:59 +08:00

fix: merge conflicts

This commit is contained in:

withchao

2025-05-15 11:42:42 +08:00

parent c9790dbdd0

commit 5079b99e97

12 changed files with 303 additions and 256 deletions

									
										pkg/rpcli/auth.go
									
		+1
		
												View File
												
				@@ -2,6 +2,7 @@ package rpcli

				import (

					"context"

					"github.com/openimsdk/protocol/auth"

					"google.golang.org/grpc"

				)