Remove merge conflict markers from lang-list.json

This commit is contained in:
maghuro authored and GitHub committed 2026-01-31 12:10:36 +00:00
1 parent 3db02370fd
commit c515815b0e
1 file changed
-1
-1
View File
@@ -1,5 +1,4 @@
{
<<<<<<< HEAD
"locale-en-US": {
"defaultMessage": "English"
},