From aff74247769cc9297335c886204d8c65da052c42 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Thu, 4 Feb 2016 21:36:11 +0100
Subject: [PATCH] Merge --amend (v2)

---
 automate.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/automate.php b/automate.php
index 2d6f4a4..cba5352 100644
--- a/automate.php
+++ b/automate.php
@@ -75,7 +75,6 @@
 		// Creation de la requete
 		$requete    = new manager\ModuleRequest('firstModule/getUsers');
 
-<<<<<<< HEAD
 
 		var_dump( $requete->dispatch() );
 		// var_dump($requete->error);
@@ -108,15 +107,7 @@
 		return true;
 
 	}displayUsers();
-=======
 
-		var_dump( $requete->dispatch() );
-		// var_dump($requete->error);
-
-		return true;
-
-	}selectUsers();
->>>>>>> f7462b406d4d1d347c4fcc87c7ae82e1b3053332