Merge remote-tracking branch 'origin/master'

[youtube-dl] / .gitignore

diff --git a/.gitignore b/.gitignore
index fca34b8baa056b84fcf000060d568e15f39f6efd..24fdb3626cd0d306cd5fc1367543f4b3691394c3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@ build/
 dist/
 MANIFEST
 README.txt
-README.md
 youtube-dl.1
 youtube-dl.bash-completion
 youtube-dl
@@ -25,3 +24,4 @@ updates_key.pem
 *.flv
 *.mp4
 *.part
+test/testdata