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.

Sign up for GitHub

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

Jump to bottom

Fix CHANGELOG after merge conflict #3320

Merged
merged 1 commit into from
Mar 7, 2022
Merged

Fix CHANGELOG after merge conflict #3320

merged 1 commit into from
Mar 7, 2022

Conversation

hubertp
Copy link
Collaborator

@hubertp hubertp commented Mar 4, 2022

Pull Request Description

Noticed that merge conflict and then mergify in #3311 led to missing PR link.
This just updates CHANGELOG to reflect the correct state, no code changes.

Checklist

Please include the following checklist in your PR:

  • The documentation has been updated if necessary.
  • All code conforms to the Scala, Java, and Rust style guides.
  • All code has been tested:
    • Unit tests have been written where possible.
    • If GUI codebase was changed: Enso GUI was tested when built using BOTH ./run dist and ./run watch.

@hubertp hubertp requested a review from jdunkerley March 4, 2022 17:58
@mwu-tow mwu-tow merged commit b26b38d into develop Mar 7, 2022
@mwu-tow mwu-tow deleted the wip/hubert/text-insert-mergeconflict-181265049 branch March 7, 2022 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mwu-tow mwu-tow mwu-tow approved these changes

@jdunkerley jdunkerley Awaiting requested review from jdunkerley

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hubertp @mwu-tow