summaryrefslogtreecommitdiffstats
path: root/templates/content/js/com.cnprog.i18n.js
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2009-11-28 00:27:08 -0500
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2009-11-28 00:27:08 -0500
commit6afaa6d392e97cc425e4ecdc82f3c1a3716986f4 (patch)
tree9820db259abb2bfdee7b46804a1bb3fd6495092b /templates/content/js/com.cnprog.i18n.js
parent818d0b99a9ed70a2f92c59a835a2a51bc66dc7d1 (diff)
downloadaskbot-6afaa6d392e97cc425e4ecdc82f3c1a3716986f4.tar.gz
askbot-6afaa6d392e97cc425e4ecdc82f3c1a3716986f4.tar.bz2
askbot-6afaa6d392e97cc425e4ecdc82f3c1a3716986f4.zip
fixed some local merge errors
Diffstat (limited to 'templates/content/js/com.cnprog.i18n.js')
-rw-r--r--templates/content/js/com.cnprog.i18n.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js
index d2356abc..7562628b 100644
--- a/templates/content/js/com.cnprog.i18n.js
+++ b/templates/content/js/com.cnprog.i18n.js
@@ -57,7 +57,6 @@ var i18nZh = {
};
var i18nEn = {
- '/':'/',
'need >15 points to report spam':'need >15 points to report spam ',
'>15 points requried to upvote':'>15 points required to upvote ',
'tags cannot be empty':'please enter at least one tag',