conflict resolved

2018-12-04 20:28:07 +01:00
parent 6bedcc5d79 cc3b84a8de
commit b7aa77acdd
38 changed files with 1010 additions and 174 deletions
--- a/user_data/strategies/test_strategy.py
+++ b/user_data/strategies/test_strategy.py
@@ -52,7 +52,8 @@ class TestStrategy(IStrategy):
    order_types = {
        'buy': 'limit',
        'sell': 'limit',
-        'stoploss': 'market'
+        'stoploss': 'market',
+        'stoploss_on_exchange': False
    }

    # Optional order time in force