From: Siebrand <siebrand@wikimedia.org>
Date: Thu, 26 Jul 2012 04:38:19 +0000 (+0000)
Subject: Merge "Drop conversion from 游標 to 光标 which can also refer to verniers"
X-Git-Tag: 1.31.0-rc.0~22950
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=74552d90d2ec62a7ffbf31607a9189a997237b71;p=lhc%2Fweb%2Fwiklou.git

Merge "Drop conversion from 游標 to 光标 which can also refer to verniers"
---

74552d90d2ec62a7ffbf31607a9189a997237b71
diff --cc includes/ZhConversion.php
index 2d47683ac0,a6e023a91d..875e66df41
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@@ -18456,4 -18454,4 +18455,4 @@@ $zh2SG = array
  '笨豬跳' => '绑紧跳',
  '蹦极跳' => '绑紧跳',
  '笑星' => '谐星',
--);
++);