Fix merge conflicts
[collectd.git] / contrib / collection3 / etc / .htaccess
1 Deny from all