废弃文件，不需要合并

public/.htaccess

@@ -0,0 +1,7 @@
+<IfModule mod_rewrite.c>
+    Options +FollowSymlinks -Multiviews
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^(.*)$ index.php?/$1 [QSA,PT,L]
+</IfModule>

public/nginx.htaccess

@@ -1,5 +1,5 @@
-location / {
+location / {
-    if (!-e $request_filename){
+    if (!-e $request_filename){
-        rewrite  ^(.*)$  /index.php?s=$1  last;   break;
+        rewrite  ^(.*)$  /index.php?s=$1  last;   break;
-    }
+    }
 }