fix invalid JSON (contains merge conflict markers) in 1.27 RC branch's locale json #5839
Conversation
This file contains hidden or 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
christian-byrne
requested review from
a team,
KarryCharon,
Yorha4D and
shinshin86
as code owners
🎭 Playwright Test Results❌ Some tests failed ⏰ Completed at: 09/28/2025, 10:51:12 PM UTC 📈 Summary
📊 Test Reports by Browser
🎉 Click on the links above to view detailed test results for each browser configuration. |
dosubot
bot
added
the
size:XS
AustinMroz
approved these changes
Sep 28, 2025
|
Test failure due to the upstream change adding a display name to LoadAudio node: https://57f79556.comfyui-playwright-chromium.pages.dev/#?testId=b0dfd63f5ac6a12fbe6e-8a6ba0bf35a23c6cbcf2 |
This was referenced Sep 29, 2025
Merged
AustinMroz
added a commit
that referenced
this pull request
Sep 30, 2025
## What's Changed ### 🚀 Features - add pricing for new api nodes (#5725) - Rework desktop install / startup UX (#5292) ### 🐛 Bug Fixes - Make experiment asset api setting hidden (#5861) - Only add the listeners for DomWidget components once (#5849) - fix invalid JSON (contains merge conflict markers) in 1.27 RC branch's locale json (#5839) - fix: Status indicator and close button appearing together (#5741) - Fix cyclic prototype errors with subgraphNodes (#5650) - fix: don't immediately close missing nodes dialog if manager is disabled (#5649) - Fix SaveAs (#5644) ### 🔧 Maintenance - Add JSON validation CI workflow (#5838) - Cherry-pick manager flag refactor to core/1.27 (#5646) - Cherry-pick desktop dialogs framework to core/1.27 (#5634) **Full Changelog**: v1.27.5...v1.27.7 ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-5862-1-27-7-27e6d73d3650819aa712e682f6b88077) by [Unito](https://www.unito.io)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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
Merge markers were inadvertantly merged in #5801, which I thought was good to merge but missed this due to difficulty reviewing the thousands of lines of translations that were in the backlog due to month+ long downtime on translation CI.
┆Issue is synchronized with this Notion page by Unito