@@ -7,7 +7,6 @@
"pages/basic/index",
"pages/user/index",
"pages/user/detail",
-<<<<<<< HEAD
"pages/type/index",
"pages/type/detail",
"pages/stock/index",
@@ -17,9 +16,6 @@
"pages/indepot/detail",
"pages/outdepot/index",
"pages/outdepot/detail",
-=======
- "pages/password/index",
->>>>>>> 01a57669c525c382024faefd25cfcfcec7c2746e
"pages/test/index",
"pages/logs/logs"
],
