Skip to content

Restore changelog entry removed in #23017. NFC #23071

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

Merged
merged 1 commit into from
Dec 4, 2024

Conversation

kleisauke
Copy link
Collaborator

No description provided.

@kripken
Copy link
Member

kripken commented Dec 4, 2024

Good catch, not sure how that happened. We need to be more careful I guess...

@kripken kripken merged commit 41eb941 into emscripten-core:main Dec 4, 2024
26 of 28 checks passed
@sbc100
Copy link
Collaborator

sbc100 commented Dec 4, 2024

I think it might be because we have ChangeLog.md merge=union in our .gitattributes. Normally its useful.

@kleisauke kleisauke deleted the restore-changelog-entry branch December 5, 2024 09:35
hedwigz pushed a commit to hedwigz/emscripten that referenced this pull request Dec 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants