Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 26, 2025

Description

This pr added a support for checking <appd> keys multisig keys duplicate.

  • <appd> keys add
  • <appd> keys show

And btw, add simapp/simd/simd to .gitignore


This is an automatic backport of pull request #18703 done by Mergify.

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
(cherry picked from commit f876b14)

# Conflicts:
#	CHANGELOG.md
#	client/keys/show.go
@mergify mergify bot added the conflicts label Mar 26, 2025
@mergify mergify bot requested a review from a team March 26, 2025 21:57
Copy link
Contributor Author

mergify bot commented Mar 26, 2025

Cherry-pick of f876b14 has failed:

On branch mergify/bp/release/v0.53.x/pr-18703
Your branch is up to date with 'origin/release/v0.53.x'.

You are currently cherry-picking commit f876b1428.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .gitignore
	modified:   client/keys/add.go
	modified:   client/keys/add_test.go
	modified:   client/keys/show_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   client/keys/show.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@aljo242 aljo242 self-assigned this Mar 26, 2025
@aljo242 aljo242 requested a review from technicallyty March 26, 2025 22:12
@technicallyty technicallyty enabled auto-merge March 27, 2025 15:34
@technicallyty technicallyty added this pull request to the merge queue Mar 27, 2025
Merged via the queue into release/v0.53.x with commit f4f9ea5 Mar 27, 2025
46 checks passed
@technicallyty technicallyty deleted the mergify/bp/release/v0.53.x/pr-18703 branch March 27, 2025 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:CLI C:Keys Keybase, KMS and HSMs conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants