conflict resolved

2018-11-26 19:08:58 +01:00
parent b63535083e 2135976cb8
commit 86354ed258
24 changed files with 247 additions and 340 deletions
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -156,6 +156,9 @@ The below is the default which is used if this is not configured in either Strat
    },
 ```

+**NOTE**: Not all exchanges support "market" orders.
+The following message will be shown if your exchange does not support market orders: `"Exchange <yourexchange>  does not support market orders."`
+
 ### What values for exchange.name?

 Freqtrade is based on [CCXT library](https://github.com/ccxt/ccxt) that supports 115 cryptocurrency