微信分享

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-18 18:23:51"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-18 18:23:51"}},"marketisstart":true,"marketrate":300}
-=======
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-18 16:22:55"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-18 16:22:55"}},"marketisstart":true,"marketrate":300}
->>>>>>> 6e96db79016c0e43ab726cc42087221c33f9963d