676c4c6d40
Conflicts: .gitignore vn.trader/CTP_connect.json vn.trader/ContractData.vt vn.trader/LTS_connect.json vn.trader/ctaEngine.py vn.trader/ctaStrategies.py vn.trader/ctaStrategyTemplate.py vn.trader/ctpGateway.py vn.trader/ltsGateway.py vn.trader/uiBasicWidget.py vn.trader/uiCtaWidget.py vn.trader/uiMainWindow.py vn.trader/vtConstant.py vn.trader/vtEngine.py vn.trader/vtGateway.py
13 lines
343 B
JSON
13 lines
343 B
JSON
{
|
|
"brokerID": "9999",
|
|
"tdAddress": "tcp://180.168.146.187:10000",
|
|
<<<<<<< HEAD
|
|
"password": "19890624",
|
|
"mdAddress": "tcp://180.168.212.228:41213",
|
|
"userID": "000300"
|
|
=======
|
|
"password": "simnow申请",
|
|
"mdAddress": "tcp://180.168.212.228:41213",
|
|
"userID": "simnow申请"
|
|
>>>>>>> refs/remotes/vnpy/master
|
|
} |