welcome: Resolve merge conflict markers in changelog-view.js #1124
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes a syntax error when parsing the JSX of the welcome package's changelog view. Changelog view should work again!
|
I am known to commit an occasional merge conflict! I am not at all surprised that this happened. Thanks! |
savetheclocktower
merged commit 45da082
into
updated-latest-electron
23 of 103 checks passed
savetheclocktower
deleted the
fix-merge-conflict-markers-in-welcome-changelog-latest-electron
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Resolved some merge conflict notation that was committed verbatim in
packages/welcome/lib/changelog-view.js(see PR "Files changed" (diff) for details).Fixes a syntax error when parsing the JSX of the welcome package's changelog view. Changelog view should work again!
Verification Process
Not tested. Just looks like valid JSX (HTML-ish) syntax now to my eyes.
I can test a PR binary if desired to confirm the Changelog view from the welcome package will display without syntax errors in the console, once binaries build in CI.
Note
Thanks for working on this stuff, I'm sure a few necessary but gnarly merges may have been encountered throughout this process...! Figured this was an easy drive-by fix, so here it is!