首页修改

core/src/timetask.json

@@ -1,5 +1 @@
-<<<<<<< HEAD
 {"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-11 14:27:30"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-11 14:27:30"}},"marketisstart":true,"marketrate":300}
-=======
-{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-09 16:38:34"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-09 16:38:34"}},"marketisstart":true,"marketrate":300}
->>>>>>> e8a0d83ea644bf86764404d62e2b7ad26a0196d8