Remove merge conflict markers from lang-list.json

This commit is contained in:
maghuro
2026-01-31 12:10:36 +00:00
committed by GitHub
parent 3db02370fd
commit c515815b0e

View File

@@ -1,5 +1,4 @@
{
<<<<<<< HEAD
"locale-en-US": {
"defaultMessage": "English"
},