conflict resolved

This commit is contained in:
misagh
2018-12-04 20:28:07 +01:00
38 changed files with 1010 additions and 174 deletions

View File

@@ -36,7 +36,8 @@
"order_types": {
"buy": "limit",
"sell": "limit",
"stoploss": "market"
"stoploss": "market",
"stoploss_on_exchange": "false"
},
"order_time_in_force": {
"buy": "gtc",