adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-13 21:31:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove merge conflicts from .po files

Browse Source
This commit is contained in:
Alexey Sokolov
2020-06-23 08:16:01 +01:00
parent 5c8361b89f
commit fd24fa6776
513 changed files with 0 additions and 2607 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/po/samplewebapi.fr_FR.po
-5
View File
@@ -6,13 +6,8 @@ msgstr ""
"X-Crowdin-Project: znc-bouncer\n"
"X-Crowdin-Project-ID: 289533\n"
"X-Crowdin-Language: fr\n"
<<<<<<< HEAD
"X-Crowdin-File: /master/modules/po/samplewebapi.pot\n"
"X-Crowdin-File-ID: 196\n"
=======
"X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n"
"X-Crowdin-File-ID: 382\n"
>>>>>>> 1.8.x
"Project-Id-Version: znc-bouncer\n"
"Language-Team: French\n"
"Language: fr_FR\n"