Merge branch 'fixes/private_scope_on_tags' into social-master

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

diff --git a/htaccess.sample b/htaccess.sample
index fb191cc7e8cf2e1082c6b0137641d68673697601..c7be2d86a0cd30b23ca5ed737e118ed90dcb20dd 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -19,9 +19,24 @@
   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
 </FilesMatch>
 
+>>>>>>> Adding htaccess.sample back*shame*