Fix syntax error in po file

Author: jcbrand

src/i18n/locales/fr/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-06-19 10:13+0200\n"
-"PO-Revision-Date: 2025-09-09 17:01+0000\n"
+"PO-Revision-Date: 2025-10-12 20:30+0200\n"
 "Last-Translator: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/conversejs/"
 "translations/fr/>\n"
@@ -2614,7 +2614,6 @@ msgstr ""
 "sera plus possible dans ce salon."
 
 #: dist/converse-no-dependencies.js:114690
->>>>>>> 55ed7e387e (Translated using Weblate (French))
 msgid ""
 "Cannot use end-to-end encryption in this groupchat, either the groupchat has "
 "some anonymity or not all participants support OMEMO."