peizhi

core/src/timetask.json

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 {
     "comment": {
         "c_rate": 720,
@@ -27,6 +26,4 @@
     "marketisstart": true,
     "marketrate": 300
 }
-=======
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-21 14:42:23"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-21 14:42:23"}},"marketisstart":true,"marketrate":300}
->>>>>>> 3fa5568eeb4a55d403f99760cd50bb85364b7a7a
+