83e50ac220
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
67 lines
706 B
Plaintext
67 lines
706 B
Plaintext
# C++源代码
|
|
ipch/
|
|
Release/
|
|
|
|
*.sdf
|
|
*.sln
|
|
*.suo
|
|
*.exp
|
|
*.pdb
|
|
*.filters
|
|
*.vcxproj
|
|
*.cd
|
|
|
|
# Python编译文件
|
|
*.pyc
|
|
|
|
# WingIDE文件
|
|
*.wpr
|
|
*.wpu
|
|
|
|
# 压缩文件
|
|
*.zip
|
|
|
|
# API的.con文件
|
|
*.con
|
|
|
|
# visual studio
|
|
*.opensdf
|
|
|
|
# 本地持久化文件
|
|
*.vn
|
|
|
|
# word文档
|
|
*.doc
|
|
*.docx
|
|
|
|
# 其他文件
|
|
*.dump
|
|
*.vssettings
|
|
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
vnpy.pyproj.user
|
|
.idea/workspace.xml
|
|
.idea/.name
|
|
.idea/vnpy.iml
|
|
*.xml
|
|
=======
|
|
=======
|
|
>>>>>>> refs/remotes/vnpy/master
|
|
|
|
<<<<<<< HEAD
|
|
# 不想同步的
|
|
*.local
|
|
=======
|
|
vn.ctp/build/*
|
|
vn.lts/build/*
|
|
.idea
|
|
>>>>>>> 65aac25731772259bf2d4049e7adbe92750ea01d
|
|
<<<<<<< HEAD
|
|
>>>>>>> refs/remotes/vnpy/master
|
|
*.json
|
|
*.json
|
|
*.json
|
|
*.pickle
|
|
=======
|
|
>>>>>>> refs/remotes/vnpy/master
|