fix: merge conflicts

4 months ago · 5fb6b3adb9
parent 8e7457febb
commit 5fb6b3adb9
1 changed files with 0 additions and 1 deletions
--- a/internal/rpc/user/user.go
+++ b/internal/rpc/user/user.go
@ -136,7 +136,6 @@ func Start(ctx context.Context, config *Config, client discovery.Conn, server gr
 }

 func (s *userServer) GetDesignateUsers(ctx context.Context, req *pbuser.GetDesignateUsersReq) (resp *pbuser.GetDesignateUsersResp, err error) {
-	return nil, errs.ErrRecordNotFound.WrapMsg("test error")
 	resp = &pbuser.GetDesignateUsersResp{}
 	users, err := s.db.Find(ctx, req.UserIDs)
 	if err != nil {