.

teamwork/pages.json

 {
-
 	"easycom": {
 		"^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
 	},
@@ -165,26 +164,19 @@
 		"style": {
 			"navigationStyle": "custom"
 		}
-<<<<<<< HEAD
-	}    ,{
-            "path" : "pages/sport/countdown",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
-=======
-	},
-	{
+	}, {
+		"path": "pages/sport/countdown",
+		"style": {
+			"navigationBarTitleText": "",
+			"enablePullDownRefresh": false
+		}
+
+	}, {
 		"path": "pages/post/message",
 		"style": {
 			"navigationStyle": "custom"
 		}
 	}],
->>>>>>> 54b3d95054c07a616682f4703d5579c57e9ad77c
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",