Merge branch 'HEAD' of ssh://git@git.raylu.net/pathery

Conflicts:
	css/challenge.css

1 files changed, 2 insertions, 2 deletions

diff --git a/globe.php b/globe.php
index 32285fc..45fd051 100644
--- a/globe.php
+++ b/globe.php
@@ -5,7 +5,7 @@ if (!session_id())
 //session_regenerate_id();

 

 //Database login:

-//include_once 'db.inc.php';

+//include_once 'sqlEmbedded.php';

 

 //TODO: CONFIRM THIS DOMAIN BEFORE TRANSFER

 //$mydomain = "http://www.mazetd.4xg.net/";

@@ -62,7 +62,7 @@ function sql_clean($string) {
 

 function CookieLogin() {

 	global $accepted;

-	include_once "includes/db.inc.php";

+	include_once "includes/sqlEmbedded.php";

 	$userID = $_COOKIE['userID'];

 	$auth = $_COOKIE['auth'];