From 5c1e103431c828c0a9edd12c8f6e3a6337267a0c Mon Sep 17 00:00:00 2001
From: Shadow <cata7007@gmail.com>
Date: Fri, 31 Jan 2014 08:29:17 +0200
Subject: [PATCH] Update admin.php

---
 Admin/admin.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/Admin/admin.php b/Admin/admin.php
index 127b539b..49a94e09 100644
--- a/Admin/admin.php
+++ b/Admin/admin.php
@@ -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
 {