summaryrefslogtreecommitdiff
path: root/server/Test
diff options
context:
space:
mode:
Diffstat (limited to 'server/Test')
-rwxr-xr-xserver/Test/AppTestClass.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 4d7cab5..6685ec7 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -1,6 +1,15 @@
<?php
include_once("../core/Plugin_Api.php");
include_once("../core/LibOverride/genTokenOptions.php");
+<<<<<<< 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
class AppTest{