diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-16 12:43:07 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-16 12:43:07 +0100 |
| commit | 4dea72976bbef1715cf06fae6c8f6f881b856f00 (patch) | |
| tree | 17e1c09b04cda1ff955f1824b14da6939b91b2f5 /server/Test/AppTestClass.php | |
| parent | 26d10bc0fa4befbac54453228ae1ce89021bdec2 (diff) | |
| parent | 11dc33c440f97410a2358f7e615d2adc5e69f072 (diff) | |
Merge branch 'develop' into loic
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{
|