apptest
This commit is contained in:
commit
d0033ae6c5
1 changed files with 8 additions and 0 deletions
|
@ -26,8 +26,12 @@ 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
|
||||
|
@ -105,6 +109,7 @@ class AppTest{
|
|||
return json_encode($this->output);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
public function getErrorInstance(){
|
||||
|
||||
|
@ -115,3 +120,6 @@ class AppTest{
|
|||
=======
|
||||
}
|
||||
>>>>>>> develop
|
||||
=======
|
||||
}
|
||||
>>>>>>> develop
|
||||
|
|
Loading…
Add table
Reference in a new issue