xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-10 06:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update admin.php

Browse Source
This commit is contained in:
Shadow
2014-01-31 08:29:17 +02:00
parent 31faf6f924
commit 5c1e103431
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Admin/admin.php
+1 -9
View File
@@ -11,19 +11,11 @@
#################################################################################
session_start();
<<<<<<< HEAD
include_once("../GameEngine/Database.php");
include_once("../GameEngine/Admin/database.php");
include_once("../GameEngine/Data/buidata.php");
include_once ("../GameEngine/Lang/" . LANG . ".php");
=======
include("../GameEngine/Database.php");
include("../GameEngine/Admin/database.php");
include("../GameEngine/config.php");
include("../GameEngine/Data/buidata.php");
// TODO: Should we including Session.php here instead?
include_once ("../GameEngine/Lang/" . LANG . ".php");
>>>>>>> c9cc7c1f0a714bc65502dce1fd28edb31c59e092
class timeFormatGenerator
{