Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / locales / bg_Cyrl_BG.ISO-8859-5.php

diff --git a/nucleus/locales/bg_Cyrl_BG.ISO-8859-5.php b/nucleus/locales/bg_Cyrl_BG.ISO-8859-5.php
index e770271..d76fb27 100644 (file)
--- a/nucleus/locales/bg_Cyrl_BG.ISO-8859-5.php
+++ b/nucleus/locales/bg_Cyrl_BG.ISO-8859-5.php
@@ -8,10 +8,17 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: bg_Cyrl_BG.ISO-8859-5.php 1868 2012-05-22 05:10:53Z sakamocchi $
+ */
+
+ /********************************************
+=======
  * @version $Id: bg_Cyrl_BG.ISO-8859-5.php 1887 2012-06-17 08:30:08Z sakamocchi $
  */
 
 /********************************************
+>>>>>>> skinnable-master
  *        Start New for 4.0                 *
  ********************************************/
 /* argument value for setlocale() in Microsoft's windows operating system */