From aeeec2f8a74397344ffa3e59c0eefa0ea4d2fdda Mon Sep 17 00:00:00 2001
From: darksider3 <leon@darksider3.de>
Date: Mon, 3 Mar 2014 16:02:52 +0000
Subject: [PATCH] Adding htaccess.sample back*shame*

---
 htaccess.sample | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htaccess.sample b/htaccess.sample
index 90e18e72e6..c7be2d86a0 100644
--- 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*
-- 
2.39.5