logauth
/
SMMP
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge --amend (v2)

This commit is contained in:
xdrm-brackets 2016-02-04 21:36:11 +01:00
parent 85b4990d99
commit aff7424776
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
automate.php
View File

@ -75,7 +75,6 @@
// Creation de la requete // Creation de la requete
$requete = new manager\ModuleRequest('firstModule/getUsers'); $requete = new manager\ModuleRequest('firstModule/getUsers');
<<<<<<< HEAD
var_dump( $requete->dispatch() ); var_dump( $requete->dispatch() );
// var_dump($requete->error); // var_dump($requete->error);
@ -108,15 +107,7 @@
return true; return true;
}displayUsers(); }displayUsers();
=======
var_dump( $requete->dispatch() );
// var_dump($requete->error);
return true;
}selectUsers();
>>>>>>> f7462b406d4d1d347c4fcc87c7ae82e1b3053332