Added new 'Scroller' plugin from @buttle which aims to replace the out-dated

[quix0rs-gnu-social.git] / htaccess.sample

diff --git a/htaccess.sample b/htaccess.sample
index 3670c8d3d3bc321c2a714631127af4e76a1eef8f..af6e19784d1aa3f720571594b92a2b5f216a0b3b 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -39,24 +39,17 @@
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule (.*) index.php?p=$1 [L,QSA]
-<<<<<<< HEAD
 
   ## You can also use PATHINFO by using this RewriteRule instead:
   # RewriteRule (.*) index.php/$1 [L,QSA]
 </IfModule>
 
 <FilesMatch "\.(ini)">
-  # For mod_access_compat in Apache <2.4
-  #Order allow,deny
-
-  # Use this instead for Apache >2.4 (mod_authz_host)
-  # Require all denied
-</FilesMatch>
-=======
-</IfModule>
-
-<FilesMatch "\.(ini)">
-  Order allow,deny
+    <IfVersion < 2.3>
+        Order allow,deny
+        Deny from all
+    </IfVersion>
+    <IfVersion >= 2.3>
+        Require all denied
+    </IfVersion>
 </FilesMatch>
-
->>>>>>> Adding htaccess.sample back*shame*