Error / Conflict Correction

2 files changed, 2 insertions, 13 deletions

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 37fc8ad..b658580 100644..100755
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -269,7 +269,7 @@ class compute
                	$imageId = $this->app->getPostParam("imageId");
                	$newName = $this->app->getPostParam("newName");
                	$adminPass = $this->app->getPostParam("adminPass");
-		if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) ){
+		if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) {
 			$this->app->setOutput("Error", "You'll have to provide server ID and the new image, name and admin password!");
 			return;
 		}
diff --git a/server/core/Image.php b/server/core/Image.php
index f2af5cc..d37c828 100644..100755
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -70,12 +70,7 @@ class image implements Core{
 	*	options for the image creation
 	*
 	**/
-<<<<<<< HEAD
-	private function createImage(array $opt){
-
-=======
 	private function createImage(){
->>>>>>> develop
 		$opt = $this->app->getPostParam("opt");
 
 
@@ -408,15 +403,9 @@ class image implements Core{
 	* @param string $id
 	*	identifier of the image
 	**/
-<<<<<<< HEAD
-	private function downloadImage($id){
-<<<<<<< HEAD
-=======
-=======
 	private function downloadImage(){
->>>>>>> develop
 		$id = $this->app->getPostParam("id");
->>>>>>> develop
+
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect parameter");
 		}