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

Error management

Browse source
This commit is contained in:
Yoggzo 2016-02-29 15:25:30 +01:00
parent d0033ae6c5
commit ae1100c168
3 changed files with 48 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

20
server/Test/AppTestClass.php
View file

@ -26,15 +26,10 @@ class AppTest{
$this->pluginsApi = plugin_api::getInstance();
$this->errorClass = new errorManagement($this);
$this->output = array();
<<<<<<< HEAD
<<<<<<< HEAD
$this->errorClass = new errorManagement($this);
=======
$this->postParams = $_POST;
>>>>>>> develop
=======
$this->postParams = $_POST;
>>>>>>> develop
}
@ -109,17 +104,12 @@ class AppTest{
return json_encode($this->output);
}
<<<<<<< HEAD
<<<<<<< HEAD
public function getErrorInstance(){
return $this->errorClass;
}
}
=======
}
>>>>>>> develop
=======
}
>>>>>>> develop