Merge branch 'skinnable-master'

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

diff --git a/index.php b/index.php
index e824f67..17c1577 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,3 +1,13 @@
+<<<<<<< HEAD
+<?php\r
+// This file will generate and return the main page of the site\r
+$CONF = array();\r
+$CONF['Self'] = 'index.php';\r
+\r
+include('./config.php');\r
+\r
+selector();\r
+=======
 <?php
 // This file will generate and return the main page of the site
 $CONF = array();
@@ -7,3 +17,4 @@ include('./config.php');
 
 selector();
 
+>>>>>>> skinnable-master