From d61a78a896b659161d2d06de97eee148b4629781 Mon Sep 17 00:00:00 2001
From: Christopher Meng <rpm@cicku.me>
Date: Thu, 4 Jul 2013 01:49:30 +0800
Subject: [PATCH] Fix

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 490c1a9..fa40244 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,7 @@
 /youtube-dl-2013.01.13.tar.gz
 /youtube-dl-2013.04.18.tar.gz
 /youtube-dl-2013.05.07.tar.gz
-<<<<<<< HEAD
 /youtube-dl-2013.05.14.tar.gz
-=======
 /youtube-dl-2013.05.23.tar.gz
 /youtube-dl-2013.06.31.tar.gz
 /youtube-dl-2013.07.02.tar.gz
->>>>>>> master