Merge remote-tracking branch 'qatar/master'

[ffmpeg] / doc / ffserver.conf

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index 217117005c57c6af3a7f9d31edf1e058a6747c1b..d10ac5bc09f29bfedeee38122b3135ad633e0a9b 100644 (file)
--- a/doc/ffserver.conf
+++ b/doc/ffserver.conf
@@ -373,5 +373,3 @@ ACL allow 192.168.0.0 192.168.255.255
 <Redirect index.html>
 URL http://www.ffmpeg.org/
 </Redirect>
-
-