osmosis-labs / osmosis

The AMM Laboratory
https://app.osmosis.zone
Apache License 2.0
888 stars 580 forks source link

chore: changelog update (backport #8412) #8413

Closed mergify[bot] closed 3 months ago

mergify[bot] commented 3 months ago

Closes: #XXX

What is the purpose of the change

Add a description of the overall background and high level changes that this PR introduces

(E.g.: This pull request improves documentation of area A by adding ....

Testing and Verifying

(Please pick one of the following options)

This change is a trivial rework / code cleanup without any test coverage.

(or)

This change is already covered by existing tests, such as (please describe tests).

(or)

This change added tests and can be verified as follows:

(example:)

Documentation and Release Note

Where is the change documented?

mergify[bot] commented 3 months ago

Cherry-pick of 1c77794ee0bea029970427aeb270848f18049a0c has failed:

On branch mergify/bp/v25.x/pr-8412
Your branch is up to date with 'origin/v25.x'.

You are currently cherry-picking commit 1c77794e.
  (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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally