summaryrefslogtreecommitdiffstats
path: root/index.php
diff options
context:
space:
mode:
authorPatrick Davison <snapwilliam@gmail.com>2013-01-14 14:49:51 -0800
committerPatrick Davison <snapwilliam@gmail.com>2013-01-14 14:49:51 -0800
commit59fc439d341900d99c00a31ff1653b274ba2a037 (patch)
tree5bd4b89bb500bc5557750228030ee0f2b8e2fb6d /index.php
parentfab36d921f22cb5999357932785e03aa88269f8d (diff)
parent532faa4d5cc5b20fba8422c87b0aac846874af43 (diff)
downloadpathery-59fc439d341900d99c00a31ff1653b274ba2a037.tar.xz
Merge branch 'HEAD' of ssh://git@git.raylu.net/pathery
Conflicts: css/challenge.css
Diffstat (limited to 'index.php')
-rw-r--r--index.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/index.php b/index.php
index 4a69a4e..88172e3 100644
--- a/index.php
+++ b/index.php
@@ -27,7 +27,7 @@ if (isset($_SESSION['accepted']) AND $_SESSION['accepted'] == 1)
//TODO: We could store this data in the session
if ($accepted) {
$userID = $_SESSION['userID'];
- include_once ('./includes/db.inc.php');
+ include_once ('./includes/sqlEmbedded.php');
$sql = "
SELECT
userData.wallColor,