Merge branch 'skinnable-master'

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

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