Skip to content

Commit

Permalink
feat: resolve merge conflict
Browse files Browse the repository at this point in the history
Signed-off-by: ImMin5 <mino@megazone.com>
  • Loading branch information
ImMin5 committed Feb 26, 2025
1 parent 4779a0f commit 0478ed7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/spaceone/identity/service/service_account_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ def update(
)

if (
service_account_vo.secret_id and params.project_id
service_account_vo.secret_id
and params.project_id
and service_account_vo.project_id != params.project_id
):
secret_manager = SecretManager()
Expand Down

0 comments on commit 0478ed7

Please sign in to comment.