Merge branch 'skinnable-master'

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

diff --git a/nucleus/locales/gl_Latn_ES.UTF-8.php b/nucleus/locales/gl_Latn_ES.UTF-8.php
index a478e8f..df67a07 100644 (file)
--- a/nucleus/locales/gl_Latn_ES.UTF-8.php
+++ b/nucleus/locales/gl_Latn_ES.UTF-8.php
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
+<?
+=======
 <?php
+>>>>>>> skinnable-master
 /**
  * Nucleus Translation File
  * Galician in Spain (Latin script)
@@ -8,7 +12,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: gl_Latn_ES.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: gl_Latn_ES.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************