Error management

1 files changed, 5 insertions, 15 deletions

diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 4d1f824..57dd422 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -26,15 +26,10 @@ class AppTest{
 		$this->pluginsApi = plugin_api::getInstance();

 		$this->errorClass = new errorManagement($this);

 		$this->output = array();

-<<<<<<< HEAD
-<<<<<<< HEAD
+

 		$this->errorClass = new errorManagement($this);

-=======
-		$this->postParams = $_POST;

->>>>>>> develop
-=======
+

 		$this->postParams = $_POST;

->>>>>>> develop
 

 	}

 	

@@ -109,17 +104,12 @@ class AppTest{
 		return json_encode($this->output);

 	}

 	

-<<<<<<< HEAD
-<<<<<<< HEAD
+

 	public function getErrorInstance(){

 		

 		return $this->errorClass;

 		

 	}

-}
-=======
 }

->>>>>>> develop
-=======
-}

->>>>>>> develop
+

+