首页热门需求链接修改

core/src/timetask.json

@@ -1,6 +1 @@
-<<<<<<< HEAD
 {"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-21 18:00:31"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-21 18:00:31"}},"marketisstart":true,"marketrate":300}
-=======
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-21 17:20:57"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-21 17:20:57"}},"marketisstart":true,"marketrate":300}
-
->>>>>>> b7bb20797d8050eac3984a093882cf7ba0879d09