From 33cf5a1cd50d88a9fd5c2dc68422a823694370a5 Mon Sep 17 00:00:00 2001
From: Astalaseven <gatien.bovyn@gmail.com>
Date: Mon, 16 Dec 2013 09:11:33 +0100
Subject: [PATCH] [enh] Remove old comment

---
 bridges/DansTonChatBridge.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bridges/DansTonChatBridge.php b/bridges/DansTonChatBridge.php
index 06ad5b2f..3bb6e0b4 100644
--- a/bridges/DansTonChatBridge.php
+++ b/bridges/DansTonChatBridge.php
@@ -19,10 +19,6 @@ class DansTonChatBridge extends BridgeAbstract{
                 $item = new \Item();
                 $item->uri = $element->find('a', 0)->href;
                 $item->title = 'DansTonChat '.$element->find('a', 1)->plaintext;
-<<<<<<< HEAD
-=======
-                //$item->content = $element->find('p.item-content', 0)->innertext;
->>>>>>> d194d02... [new] Bridges for DTC and SDZ
                 $item->content = $element->find('a', 0)->innertext;
                 $this->items[] = $item;
         }