冲突

h5_web/common/apiurl.js

@@ -84,13 +84,11 @@ const apiurl = {
     // 政策资讯详情
     getPolicyInfoDetailsUrl: '/policy/article/door/info'
   },
-<<<<<<< HEAD
 	
 	// 我的投递
 	delivery: {
 		deliveryListUrl: '/delivery/myDeliveredList'
-	}
-=======
+	},
   
   /**
    * 招聘就业模块
@@ -103,7 +101,6 @@ const apiurl = {
     // 岗位详情
     getJobDetailsUrl: '/companypost/getDetail'
   }
->>>>>>> c431929b82c93aa1aadca0aa1059e7655f9cfeae
 }
 
 export {