Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update incorrect PR link in changelog regarding "check x/bank send enabled" fix (backport #2714) #2717

Merged
merged 2 commits into from
Nov 9, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 9, 2022

This is an automatic backport of pull request #2714 done by Mergify.
Cherry-pick of 7249d82 has failed:

On branch mergify/bp/release/v4.2.x/pr-2714
Your branch is up to date with 'origin/release/v4.2.x'.

You are currently cherry-picking commit 7249d82.
  (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:   CHANGELOG.md

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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Co-authored-by: Cian Hatton <cian@interchain.io>
(cherry picked from commit 7249d82)

# Conflicts:
#	CHANGELOG.md
@chatton
Copy link
Contributor

chatton commented Nov 9, 2022

My editor stripped out a lot of trailing whitespace.

@colin-axner colin-axner merged commit 0730e1f into release/v4.2.x Nov 9, 2022
@colin-axner colin-axner deleted the mergify/bp/release/v4.2.x/pr-2714 branch November 9, 2022 15:56
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 27, 2023
…abled" fix (backport cosmos#2714) (cosmos#2717)

* Update check x/bank sendEnabled link in changelog (cosmos#2714)

Co-authored-by: Cian Hatton <cian@interchain.io>
(cherry picked from commit 7249d82)

# Conflicts:
#	CHANGELOG.md

* chore: fixing merge conflicts

Co-authored-by: Calvin Lau <38898718+calvinaco@users.noreply.github.com>
Co-authored-by: Cian Hatton <cianhatton@gmail.com>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
…abled" fix (backport cosmos#2714) (cosmos#2717)

* Update check x/bank sendEnabled link in changelog (cosmos#2714)

Co-authored-by: Cian Hatton <cian@interchain.io>
(cherry picked from commit 7249d82)

# Conflicts:
#	CHANGELOG.md

* chore: fixing merge conflicts

Co-authored-by: Calvin Lau <38898718+calvinaco@users.noreply.github.com>
Co-authored-by: Cian Hatton <cianhatton@gmail.com>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
…abled" fix (backport cosmos#2714) (cosmos#2717)

* Update check x/bank sendEnabled link in changelog (cosmos#2714)

Co-authored-by: Cian Hatton <cian@interchain.io>
(cherry picked from commit 7249d82)

# Conflicts:
#	CHANGELOG.md

* chore: fixing merge conflicts

Co-authored-by: Calvin Lau <38898718+calvinaco@users.noreply.github.com>
Co-authored-by: Cian Hatton <cianhatton@gmail.com>
@ulbqb ulbqb mentioned this pull request Jul 31, 2023
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants