mirror of
https://github.com/znc/znc.git
synced 2026-07-07 02:11:20 +02:00
Fix merge conflict
This commit is contained in:
@@ -8,11 +8,7 @@ msgstr ""
|
||||
"X-Crowdin-Language: nl\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: Dutch\n"
|
||||
"Language: nl_NL\n"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user