Fix

12 years ago · d61a78a896
parent 8b9dedfed3
commit d61a78a896
1 changed files with 0 additions and 3 deletions
--- 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