adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 09:22:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Alexey Sokolov
2019-07-12 08:24:58 +01:00
parent c56a4093d5
commit 0ad4e51b39
513 changed files with 0 additions and 6306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/po/modpython.fr_FR.po
-4
View File
@@ -8,11 +8,7 @@ msgstr ""
"X-Crowdin-Language: fr\n"
"X-Crowdin-File: /master/modules/po/modpython.pot\n"
"Project-Id-Version: znc-bouncer\n"
<<<<<<< HEAD
"Last-Translator: Various people\n"
=======
"Last-Translator: DarthGandalf\n"
>>>>>>> 1.7.x
"Language-Team: French\n"
"Language: fr_FR\n"