Closed mergify[bot] closed 2 months ago
Cherry-pick of 71d54a43127545ca36e817a16def9b6e20f3515b has failed:
On branch mergify/bp/release/v0.3.x/pr-476
Your branch is up to date with 'origin/release/v0.3.x'.
You are currently cherry-picking commit 71d54a4.
(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: proto/ojo/oracle/v1/tx.proto
modified: x/oracle/keeper/msg_server.go
modified: x/oracle/types/codec.go
modified: x/oracle/types/proposal.go
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: app/upgrades.go
both modified: x/oracle/types/msgs.go
both modified: x/oracle/types/tx.pb.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
Description
closes: #XXXX
Author Checklist
All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.
I have...
!
to the type prefix if API or client breaking changeCHANGELOG.md
Reviewers Checklist
All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.
I have...
This is an automatic backport of pull request #476 done by Mergify.