diff options
| author | EoleDev <EoleDev@outlook.fr> | 2016-03-15 23:08:55 +0100 |
|---|---|---|
| committer | EoleDev <EoleDev@outlook.fr> | 2016-03-15 23:08:55 +0100 |
| commit | 85b5ebaa182ae8897d825638a2c9b103d7e88eca (patch) | |
| tree | af162fdf2467c1ea2ee84f362628aa1b45d9c49c /server/Test/AppTestClass.php | |
| parent | b50d3cc788038122b0afc22a3e94161e1848d022 (diff) | |
| parent | 2b8decb81faeb7928bcbfda84c6f33a003f707fd (diff) | |
Merge branch 'Eole' into develop
Diffstat (limited to 'server/Test/AppTestClass.php')
| -rwxr-xr-x | server/Test/AppTestClass.php | 12 |
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{
|