X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-next.git;a=blobdiff_plain;f=nucleus%2Flocales%2Fca_Latn_ES.ISO-8859-1.php;h=0a4e1ac896988bb33ab84bc0b60634364c9554da;hp=4360d76afd727fdbca6f5583f6ccc0093c5cff0d;hb=c90b0980cfa3e79cd4bc7eed551a64a5e2b02a5c;hpb=6575e866f3fd1938601432841d80f82e9d259265

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