1 files changed, 12 insertions, 0 deletions
diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 57dd422..b398088 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -1,12 +1,24 @@
 <?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{