From e20de1f63502aa647131d8c419c89be1ca2abc43 Mon Sep 17 00:00:00 2001
From: dothang <dothang@web>
Date: Thu, 21 May 2015 00:48:24 +0200
Subject: [PATCH]

---
 student/dothang/index.mdwn | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/student/dothang/index.mdwn b/student/dothang/index.mdwn
index fa57b033..ddd1b73c 100644
--- a/student/dothang/index.mdwn
+++ b/student/dothang/index.mdwn
@@ -13,11 +13,9 @@ Links documenting the results of my work
 
 * [My communication with developers in a public mozzila bug tracker](https://bugzilla.mozilla.org/show_bug.cgi?id=720050)
 
-<<<<<<< HEAD
+
 * [[Showcase fixed]]preview_changes.jpg)
-=======
 * [[img src=preview_changes.jpg alt=showcase]]
->>>>>>> eb8ef41e5a54282ac9679fe0ef9cfb65ea0c7de3
 
 Presentation
 ==========
-- 
2.39.2