Przeglądaj źródła

IE8浏览器 登录框

wangshan 9 lat temu
rodzic
commit
d5ea26c6f3
1 zmienionych plików z 0 dodań i 4 usunięć
  1. 0 4
      core/src/timetask.json

+ 0 - 4
core/src/timetask.json

@@ -1,5 +1 @@
-<<<<<<< HEAD
 {"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-05 17:12:57"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-05 17:12:57"}},"marketisstart":true,"marketrate":300}
-=======
-{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-05 11:43:55"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-05 11:43:55"}},"marketisstart":true,"marketrate":300}
->>>>>>> bb4a256ca5b1c12f899082e7b4a48df32b9db996