Merge remote-tracking branch 'upstream/master'

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

diff --git a/htaccess.sample b/htaccess.sample
index 3670c8d3d3bc321c2a714631127af4e76a1eef8f..8a689858c73b9ec3ac7f3bdb99de1726378e105a 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -39,24 +39,8 @@
   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*