Merge remote-tracking branch 'qatar/master'
[ffmpeg.git] / doc / ffserver.conf
index 2171170..d10ac5b 100644 (file)
@@ -373,5 +373,3 @@ ACL allow 192.168.0.0 192.168.255.255
 <Redirect index.html>
 URL http://www.ffmpeg.org/
 </Redirect>
-
-