处理 冲突

package.json

@@ -54,6 +54,7 @@
     "semver": "^5.4.1",
     "style-loader": "^0.16.1",
     "url-loader": "^0.5.9",
+    "vue-awesome-swiper": "^3.1.3",
     "vue-loader": "^11.1.4",
     "vue-style-loader": "^2.0.0",
     "webpack": "^2.7.0",

src/view/home.vue

@@ -69,7 +69,6 @@
 
 <script>
 	import homeApi from "../models/home-model.js";
-//	import Swiper from '@/common/swiper';
 	import { Alert, Toast,Popup,Picker,Loading } from "vux";
 	import routerFooter from "../components/nav-bottom";
 	export default {