loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add commentaries, update error management and correct some mistakes in Image.php, resolve conflict in AppTestClass.php

Browse source
This commit is contained in:
Yoggzo 2016-03-17 09:46:32 +01:00
parent 0ce2b2fa30
commit e01936a73e
2 changed files with 134 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server/Test/AppTestClass.php
View file

@ -1,24 +1,12 @@
<?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{