Remove merge conflict markers from lang-list.json

maghuro · web-flow · commit c515815b0e85 · 2026-01-31T12:10:36.000Z
diff --git a/frontend/src/locale/src/lang-list.json b/frontend/src/locale/src/lang-list.json
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
   "locale-en-US": {
     "defaultMessage": "English"
   },
