From fa261c3042b3fce1cc88cea3b67381bae9f7c747 Mon Sep 17 00:00:00 2001
From: Loic Guegan <16000511@e105m10.istic.univ-rennes1.fr>
Date: Tue, 29 Mar 2016 10:46:36 +0200
Subject: [PATCH] Test

---
 main/Main.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/main/Main.java b/main/Main.java
index 0e6b0de..b843336 100644
--- a/main/Main.java
+++ b/main/Main.java
@@ -19,11 +19,9 @@ import structure.Router;
 public class Main {
 
 	public static void main(String[] args) {
-<<<<<<< HEAD
+
 		Grid g=new Grid(Grid.Protocol.DSDV);
-=======
-		Grid g=new Grid(Grid.Protocol.AODV);
->>>>>>> bd27005eadf8c9526bf0167ea19a2d949bcca1f9
+
 
 		// Build Graph for graphstream
 		MyGraph gr=new MyGraph("Routage Oportuniste", g);