From 8ff7d9460f1fd4413d043f74ac93088506fa9820 Mon Sep 17 00:00:00 2001
From: Damien Calesse <madeinjb@gmail.com>
Date: Thu, 24 Jul 2014 13:58:38 +0200
Subject: [PATCH] MondeDiplo Conflict

---
 bridges/MondeDiploBridge.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/bridges/MondeDiploBridge.php b/bridges/MondeDiploBridge.php
index f67c74b0..2077205e 100644
--- a/bridges/MondeDiploBridge.php
+++ b/bridges/MondeDiploBridge.php
@@ -60,8 +60,3 @@ class MondeDiploBridge extends BridgeAbstract{
         return 21600; // 6 hours
     }
 }
-        
-<<<<<<< HEAD
-=======
-
->>>>>>> bf2303ead8b6c8aa01a3e1c58ddd27cbc4fc2d71