Selaa lähdekoodia

修改剑鱼定时

renzheng 9 vuotta sitten
vanhempi
commit
3fa5568eeb
1 muutettua tiedostoa jossa 0 lisäystä ja 4 poistoa
  1. 0 4
      core/src/timetask.json

+ 0 - 4
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-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}
-=======
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-21 10:15:34"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-21 10:15:34"}},"marketisstart":true,"marketrate":300}
->>>>>>> ffa6a97477331850e613c77ac970dbd80d2448d5