fc

public/config.js

@@ -15,8 +15,4 @@ const urlConfig = {
       jump_url: 'https://lyfydp.longyou.gov.cn:9443/meeting/h5/#/', //跳转移动端路径
 
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 6cdfdfdd1241e179893d1557535f77119b905a63
 }
\ No newline at end of file