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/freqtrade/strategy/default_strategy.py
+++ b/freqtrade/strategy/default_strategy.py
@@ -32,7 +32,8 @@ class DefaultStrategy(IStrategy):
    order_types = {
        'buy': 'limit',
        'sell': 'limit',
-        'stoploss': 'limit'
+        'stoploss': 'limit',
+        'stoploss_on_exchange': False
    }

    # Optional time in force for orders