X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-next.git;a=blobdiff_plain;f=nucleus%2Flocales%2Fzh_Hant_TW.UTF-8.php;h=a068c26ce08b90541be720c516030b4c746576d0;hp=b14fecf6e0902341822fef5757120bdd78ad36e1;hb=c90b0980cfa3e79cd4bc7eed551a64a5e2b02a5c;hpb=6575e866f3fd1938601432841d80f82e9d259265

diff --git a/nucleus/locales/zh_Hant_TW.UTF-8.php b/nucleus/locales/zh_Hant_TW.UTF-8.php
index b14fecf..a068c26 100644
--- a/nucleus/locales/zh_Hant_TW.UTF-8.php
+++ b/nucleus/locales/zh_Hant_TW.UTF-8.php
@@ -7,7 +7,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: zh_Hant_TW.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: zh_Hant_TW.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************