Merging iexplorer converter

This commit is contained in:
xdrm-brackets 2016-05-24 09:13:55 +02:00
parent b76bf44a09
commit 15afa15f3c
1 changed files with 0 additions and 5 deletions

View File

@ -32,15 +32,10 @@
$response = $request->dispatch(); $response = $request->dispatch();
// Si erreur, on l'affiche // Si erreur, on l'affiche
<<<<<<< HEAD
if( $response->error != ManagerError::Success )
var_dump( ManagerError::explicit($response->error) );
=======
if( $response->error != ManagerError::Success ){ if( $response->error != ManagerError::Success ){
var_dump( ManagerError::explicit($response->error) ); var_dump( ManagerError::explicit($response->error) );
exit(); exit();
} }
>>>>>>> feature/convert-iexplorer-to-calllog
// On récupère les données // On récupère les données
$logs = $response->get('data'); $logs = $response->get('data');