diff --git a/xxl-job/application.properties b/xxl-job/application.properties
index b512c197..eae3a677 100644
--- a/xxl-job/application.properties
+++ b/xxl-job/application.properties
@@ -23,15 +23,9 @@ mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
 #mybatis.type-aliases-package=com.xxl.job.admin.core.model
 
 ### xxl-job, datasource
-<<<<<<< HEAD
-spring.datasource.url=jdbc:mysql://120.71.183.195:3306/zyt_shop/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
-spring.datasource.username=zyt_shop
-spring.datasource.password=Gb84505016@zytshop
-=======
 spring.datasource.url=jdbc:mysql://192.168.0.106:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
 spring.datasource.password=lilishop
->>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 ### datasource-pool