From c515815b0e857599aa45b44419c29441b7e4f8c1 Mon Sep 17 00:00:00 2001
From: maghuro <mrasquinho@gmail.com>
Date: Sat, 31 Jan 2026 12:10:36 +0000
Subject: [PATCH] Remove merge conflict markers from lang-list.json

---
 frontend/src/locale/src/lang-list.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/locale/src/lang-list.json b/frontend/src/locale/src/lang-list.json
index 76f6617c..a37dedf1 100644
--- 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"
   },