Merge branch 'master' of git.gnu.io:Quix0r/gnu-social

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

diff --git a/htaccess.sample b/htaccess.sample
index f7513cc0c7dd54153a80600ea16eacd168c443c5..3670c8d3d3bc321c2a714631127af4e76a1eef8f 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -39,6 +39,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]
@@ -51,3 +52,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*