merge

pages.json

@@ -36,7 +36,6 @@
 			}
 		},
 		{
-<<<<<<< HEAD
 			"path": "pages/Message/Scheduling",
 			"style": {
 				"navigationBarTitleText": "排班通知",
@@ -54,17 +53,14 @@
 			"style": {
 				"navigationBarTitleText": "政策通知"
 			}
-		}
-=======
+		},
+{
 			"path" : "pages/Repair/RepairDetail",
 			"style" : 
 			{
 				"navigationBarTitleText" : "报修详情"
 			}
 		}
-
-
->>>>>>> bd19dfbd5ad48b7e36b032ccc036bd3138d76b52
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/Message/Message.vue

@@ -48,7 +48,6 @@
 </template>
 
 <script>
-<<<<<<< HEAD
 	import work from '../../components/messages/work.vue';
 	import emergent from '../../components/messages/emergent.vue';
 	import policy from '../../components/messages/policy.vue';
@@ -92,9 +91,6 @@
 			},
 		}
 	}
-=======
-	
->>>>>>> bd19dfbd5ad48b7e36b032ccc036bd3138d76b52
 </script>
 
 <style lang="scss">