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 90e18e72e678e68a818b5051d73dd26a0477a937..c7be2d86a0cd30b23ca5ed737e118ed90dcb20dd 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -19,6 +19,7 @@
   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]
@@ -31,3 +32,11 @@
   # 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*