ojo-network / ojo

Apache License 2.0
52 stars 28 forks source link

fix: Add gov proposal migration in v0.3.1 upgrade handler (backport #478) #479

Closed mergify[bot] closed 2 months ago

mergify[bot] commented 2 months ago

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...

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...

mergify[bot] commented 2 months ago

Cherry-pick of 2965d45976ea63053dc84b910b37ea46a06730b5 has failed:

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

You are currently cherry-picking commit 2965d45.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   app/upgrades.go

no changes added to commit (use "git add" and/or "git commit -a")

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