From 9c9085368bbdfeaf1d024ceab10452abe7863fb2 Mon Sep 17 00:00:00 2001
From: leolin310148 <leolin310148@gmail.com>
Date: Fri, 15 Nov 2013 21:21:46 +0800
Subject: [PATCH] 1.0

---
 README | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/README b/README
index d33c50f..d6b1f21 100644
--- a/README
+++ b/README
@@ -1,7 +1,3 @@
 ShortcutBadger:
-<<<<<<< HEAD
-![ScreenShot](https://raw.github.com/leolin310148/ShortcutBadger/screenshots/ss_sony.png)
-=======
-<img src="http://i.imgur.com/h52zDPk.png"/>
-![alt tag](http://i.imgur.com/h52zDPk.png)
->>>>>>> e4e404ac5696a25997b0224100957a57ced77586
+![ScreenShot](https://raw.github.com/leolin310148/ShortcutBadger/master/screenshots/ss_sony.png)
+