浏览代码

分享二维码

wangshan 9 年之前
父节点
当前提交
2d1d8abdb8
共有 1 个文件被更改,包括 0 次插入4 次删除
  1. 0 4
      core/src/timetask.json

+ 0 - 4
core/src/timetask.json

@@ -1,5 +1 @@
-<<<<<<< HEAD
 {"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-22 17:02:43"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-22 17:02:43"}},"marketisstart":true,"marketrate":300}
-=======
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-22 16:40:29"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-22 16:40:29"}},"marketisstart":true,"marketrate":300}
->>>>>>> 7ab7600bc56154c82e3fe7e9aaea318065c5f6f4