1 files changed, 8 insertions, 0 deletions
diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 3ff0aea..4d1f824 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -27,10 +27,14 @@ class AppTest{
 		$this->errorClass = new errorManagement($this);
 		$this->output = array();
 <<<<<<< HEAD
+<<<<<<< HEAD
 		$this->errorClass = new errorManagement($this);
 =======
 		$this->postParams = $_POST;
 >>>>>>> develop
+=======
+		$this->postParams = $_POST;
+>>>>>>> develop
 
 	}
 	
@@ -106,6 +110,7 @@ class AppTest{
 	}
 	
 <<<<<<< HEAD
+<<<<<<< HEAD
 	public function getErrorInstance(){
 		
 		return $this->errorClass;
@@ -115,3 +120,6 @@ class AppTest{
 =======
 }
 >>>>>>> develop
+=======
+}
+>>>>>>> develop