From: Siebrand Mazeland <siebrand@kitano.nl>
Date: Thu, 10 Apr 2014 07:57:22 +0000 (+0200)
Subject: Remove unused key importhistoryconflict
X-Git-Tag: 1.31.0-rc.0~16289^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/wiki/supprimer.php?a=commitdiff_plain;h=76f1dd15f6bd59e0a2f0463355370cc46d8c207e;p=lhc%2Fweb%2Fwiklou.git

Remove unused key importhistoryconflict

Change-Id: I50b0554bf3125e63e9d7de94d0ddcc553d19c3de
---

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 237c64b763..7dc9e537f3 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2310,7 +2310,6 @@
     "importbadinterwiki": "Bad interwiki link",
     "importnotext": "Empty or no text",
     "importsuccess": "Import finished!",
-    "importhistoryconflict": "Conflicting history revision exists (may have imported this page before)",
     "importnosources": "No transwiki import sources have been defined and direct history uploads are disabled.",
     "importnofile": "No import file was uploaded.",
     "importuploaderrorsize": "Upload of import file failed.\nThe file is bigger than the allowed upload size.",