3 年之前 · b5dfa76756
--- a/app.json
+++ b/app.json
@@ -1,9 +1,5 @@
 
				 {
			
 
				   "pages": [
			
 
				-<<<<<<< HEAD
			
 
				-   
			
 
				-=======
			
 
				->>>>>>> cee58df8b145ecdc862faa94d4104d54ac77e77f
			
 
				     "pages/home/index",
			
 
				     "pages/login/index",
			
 
				     "pages/search/index",