Comfy-Org/ComfyUI_frontend
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI_frontend.git synced 2026-04-30 11:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix invalid JSON (contains merge conflict markers) in 1.27 RC branch's locale json (#5839)

Browse Source 
## Summary

Merge markers were inadvertantly merged in
https://github.com/comfy-org/ComfyuI_frontend/pull/5801, which [I
thought was good to
merge](https://github.com/Comfy-Org/ComfyUI_frontend/pull/5801#issuecomment-3340372578)
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](https://www.notion.so/PR-5839-fix-invalid-JSON-contains-merge-conflict-markers-in-1-27-RC-branch-s-locale-json-27c6d73d365081439838ff4055714cf5)
by [Unito](https://www.unito.io)
This commit is contained in:
Christian Byrne
2025-09-28 16:06:36 -07:00
committed by GitHub
parent d6f0cae35c
commit 0ee3138485
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/locales/en/main.json
View File

@@ -1912,8 +1912,6 @@
"showGroups": "Show Frames/Groups", "showGroups": "Show Frames/Groups",
"renderBypassState": "Render Bypass State", "renderBypassState": "Render Bypass State",
"renderErrorState": "Render Error State" "renderErrorState": "Render Error State"
<<<<<<< Updated upstream
=======
}, },
"assetBrowser": { "assetBrowser": {
"assets": "Assets", "assets": "Assets",
@@ -1942,6 +1940,5 @@
"Close": "Close" "Close": "Close"
} }
} }
>>>>>>> Stashed changes
} }
} }