Skip to content

fix(gator-permissions-controller): remove merge conflict marker from CHANGELOG#7943

Merged
cryptodev-2s merged 1 commit intomainfrom
fix/gator-permissions-changelog-conflict-marker
Feb 16, 2026
Merged

fix(gator-permissions-controller): remove merge conflict marker from CHANGELOG#7943
cryptodev-2s merged 1 commit intomainfrom
fix/gator-permissions-changelog-conflict-marker

Conversation

@cryptodev-2s
Copy link
Contributor

@cryptodev-2s cryptodev-2s commented Feb 16, 2026

Explanation

References

Checklist

  • I've updated the test suite for new or updated code as appropriate
  • I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
  • I've communicated my changes to consumers by updating changelogs for packages I've changed
  • I've introduced breaking changes in this PR and have prepared draft pull requests for clients and consumer packages to resolve them

Note

Low Risk
Documentation-only change to a changelog with no runtime or build impact.

Overview
Removes an accidentally committed merge-conflict marker in packages/gator-permissions-controller/CHANGELOG.md, restoring the @metamask/transaction-controller bump entry under Unreleased.

Written by Cursor Bugbot for commit 509f693. This will update automatically on new commits. Configure here.

@cryptodev-2s cryptodev-2s self-assigned this Feb 16, 2026
@cryptodev-2s cryptodev-2s requested review from a team as code owners February 16, 2026 11:20
@cryptodev-2s cryptodev-2s force-pushed the fix/gator-permissions-changelog-conflict-marker branch from a7cc647 to 509f693 Compare February 16, 2026 11:21
@cryptodev-2s cryptodev-2s added this pull request to the merge queue Feb 16, 2026
Merged via the queue into main with commit 84eab62 Feb 16, 2026
302 checks passed
@cryptodev-2s cryptodev-2s deleted the fix/gator-permissions-changelog-conflict-marker branch February 16, 2026 11:38
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.

2 participants