add commentaries, update error management and correct some mistakes in Image.php, resolve conflict in AppTestClass.php

1 files changed, 0 insertions, 12 deletions

diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index b398088..5e8efc7 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -1,24 +1,12 @@
 <?php

 include_once("../core/Plugin_Api.php");

 include_once("../core/LibOverride/genTokenOptions.php");

-<<<<<<< HEAD
-<<<<<<< Updated upstream
-=======
 include_once("../core/ErrorManagement.php");

 

 use OpenCloud\Common\Error\BadResponseError;

 use OpenCloud\Common\Error\BaseError;

 use OpenCloud\Common\Error\NotImplementedError;

 use OpenCloud\Common\Error\UserInputError;

->>>>>>> Stashed changes
-=======
-include_once("../core/ErrorManagement.php");

-

-use OpenStack\Common\Error\BadResponseError;

-use OpenStack\Common\Error\BaseError;

-use OpenStack\Common\Error\NotImplementedError;

-use OpenStack\Common\Error\UserInputError;

->>>>>>> develop
 

 class AppTest{