|
|
@@ -1,6 +1 @@
|
|
|
-<<<<<<< HEAD
|
|
|
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-02-29 17:31:40"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-02-29 17:31:40"}},"marketisstart":true,"marketrate":300}
|
|
|
-=======
|
|
|
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-02-01 14:14:58"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-02-01 14:14:58"}},"marketisstart":true,"marketrate":300}
|
|
|
-
|
|
|
->>>>>>> c5f3e54ed147936d13ef9e733fff8e006b11d01f
|
|
|
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-02-29 17:31:40"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-02-29 17:31:40"}},"marketisstart":true,"marketrate":300}
|
