Skip to content

Y
yaconf
Commit 87c27496 authored by wangdong1's avatar wangdong1
Browse files
Options

add:删除冲突代码

parent f53e5b46
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
interface.ini
View file @ 87c27496
...@@ -1313,7 +1313,6 @@ shqc.chicken.task.sign_in_list = "http://shqc.test.yidian-inc.com/chicken/task/s ...@@ -1313,7 +1313,6 @@ shqc.chicken.task.sign_in_list = "http://shqc.test.yidian-inc.com/chicken/task/s
shqc.chicken.task.do_sign_in = "http://shqc.test.yidian-inc.com/chicken/task/do_sign_in" shqc.chicken.task.do_sign_in = "http://shqc.test.yidian-inc.com/chicken/task/do_sign_in"
shqc.chicken.task.hour_check_list = "http://shqc.test.yidian-inc.com/chicken/task/hour_check_list" shqc.chicken.task.hour_check_list = "http://shqc.test.yidian-inc.com/chicken/task/hour_check_list"
shqc.chicken.task.do_hour_check = "http://shqc.test.yidian-inc.com/chicken/task/do_hour_check" shqc.chicken.task.do_hour_check = "http://shqc.test.yidian-inc.com/chicken/task/do_hour_check"
>>>>>>> master
[dev : test : common] [dev : test : common]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment