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

---
 student/dothang/index.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/student/dothang/index.mdwn b/student/dothang/index.mdwn
index 634f1e82..fa57b033 100644
--- a/student/dothang/index.mdwn
+++ b/student/dothang/index.mdwn
@@ -13,7 +13,11 @@ 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
 ==========
@@ -24,4 +28,3 @@ Presentation
 
 
 
-
-- 
2.39.2