2 files changed, 7 insertions, 17 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
+
+
diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php
index 47a69e2..d21eefb 100644
--- a/server/Test/imageTests.php
+++ b/server/Test/imageTests.php
@@ -17,7 +17,7 @@ $opt['minRam'] = 10;
 //$new_image = $image->createImage($opt);
 
 //Liste des images
-$images = $image->listImage();
+$images = $image->action("listImage");
 
 if(isset($images)){
     echo "Images présentes :";
@@ -49,7 +49,7 @@ else{
 // Détails Image
 //$details = $image->imageDetails($id_image);
 
-$image->deleteImage('123456');
+//$image->deleteImage('123456');
 
 //$image->desactivateImage($id_image);
 //$image->reactivateImage($id_image);