diff options
| author | EoleDev <root@serverpc.home> | 2016-03-09 16:16:22 +0100 |
|---|---|---|
| committer | EoleDev <root@serverpc.home> | 2016-03-09 16:16:22 +0100 |
| commit | b7ebe1272c1127df290535af2430622b28160bb0 (patch) | |
| tree | aeea3331be091a01d821db6b0531ef8b17427293 /server/Test | |
| parent | a706b0d5655f6aa94d2a245cf4250c3e37538e1d (diff) | |
Library maj
Diffstat (limited to 'server/Test')
| -rwxr-xr-x | server/Test/AppTestClass.php | 9 |
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{
|