X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-next.git;a=blobdiff_plain;f=nucleus%2Flocales%2Ffa_Arab_IR.UTF-8.php;h=3ac45ec20535da9ecd4214b313ac3991d1e6ecbb;hp=a074c3d1bf819fee373f3471b0b852273a5ca35c;hb=c90b0980cfa3e79cd4bc7eed551a64a5e2b02a5c;hpb=3375c0bd644215856743551e2f4992a0f36e2da0

diff --git a/nucleus/locales/fa_Arab_IR.UTF-8.php b/nucleus/locales/fa_Arab_IR.UTF-8.php
index a074c3d..3ac45ec 100644
--- a/nucleus/locales/fa_Arab_IR.UTF-8.php
+++ b/nucleus/locales/fa_Arab_IR.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: fa_Arab_IR.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: fa_Arab_IR.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
  /********************************************