Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / locales / ca_Latn_ES.UTF-8.php

diff --git a/nucleus/locales/ca_Latn_ES.UTF-8.php b/nucleus/locales/ca_Latn_ES.UTF-8.php
index 247ba4e..57acb07 100644 (file)
--- a/nucleus/locales/ca_Latn_ES.UTF-8.php
+++ b/nucleus/locales/ca_Latn_ES.UTF-8.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.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: ca_Latn_ES.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************