(no commit message)

diff --git a/student/dothang/index.mdwn b/student/dothang/index.mdwn
index fa57b0335e0e9d266ff39366c228d1fb22bc60d2..ddd1b73c744084f171e043279f910473554b9c6a 100644 (file)
--- 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
 ==========