Fixing conflicts

Kill0p · Feb 12, 2013 · 02af027 · 02af027
2 parents 0620d1e + 60d5f37
commit 02af027
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/config/autoload/global.php b/config/autoload/global.php
@@ -31,5 +31,4 @@
                     => 'Zend\Db\Adapter\AdapterServiceFactory',
         ),
     ),
-);
-
+);
diff --git a/public/.htaccess b/public/.htaccess
@@ -0,0 +1,7 @@
+RewriteEngine On
+RewriteCond %{REQUEST_FILENAME} -s [OR]
+RewriteCond %{REQUEST_FILENAME} -l [OR]
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteBase /fmi
+RewriteRule ^.*$ - [NC,L]
+RewriteRule ^.*$ index.php [NC,L]
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,5 +31,4 @@ @@
                         => 'Zend\Db\Adapter\AdapterServiceFactory',
             ),
         ),
-    );
+    );