-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule (.*) index.php?p=$1 [L,QSA]
+ 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>