Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / index.php

diff --git a/nucleus/index.php b/nucleus/index.php
index 89d14ec..fed8f8d 100644 (file)
--- a/nucleus/index.php
+++ b/nucleus/index.php
@@ -11,8 +11,13 @@
  */
 /**
  * @license http://nucleuscms.org/license.txt GNU General Public License
+<<<<<<< HEAD
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group
+ * @version $Id: index.php 1748 2012-04-13 13:27:57Z sakamocchi $
+=======
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
  * @version $Id: index.php 1888 2012-06-17 08:38:54Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 // we are using admin stuff: