From 4840a292dfec76b89007c1c48362ebe434d49031 Mon Sep 17 00:00:00 2001
From: G <w_i_n_d_y_o@hotmail.com>
Date: Tue, 27 Jan 2026 12:39:53 +0100
Subject: [PATCH] Fixed trailing Git Merge text (#2619)

updated French locale to remove failed gitmerge chars
---
 locales/fr-FR.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/fr-FR.po b/locales/fr-FR.po
index 6bfc25117..124ad533a 100644
--- a/locales/fr-FR.po
+++ b/locales/fr-FR.po
@@ -2033,7 +2033,7 @@ msgstr "Afficher"
 
 #: src/routes/builder/$resumeId/-sidebar/right/sections/layout/pages.tsx
 msgid "Sidebar"
-msgstr "Encart<<<<<<< HEAD"
+msgstr "Encart"
 
 #: src/routes/builder/$resumeId/-sidebar/right/sections/layout/index.tsx
 msgid "Sidebar Width"