whitelist conflict resolved with develop branch

2018-11-02 18:59:31 +01:00
parent 05b8010460 9cadb188d7
commit 080ecae332
16 changed files with 351 additions and 468 deletions
--- a/freqtrade/edge/init.py
+++ b/freqtrade/edge/init.py
@@ -38,7 +38,7 @@ class Edge():
        self.strategy: IStrategy = StrategyResolver(self.config).strategy
        self.ticker_interval = self.strategy.ticker_interval
        self.tickerdata_to_dataframe = self.strategy.tickerdata_to_dataframe
-        self.get_timeframe = Backtesting.get_timeframe
+        self.get_timeframe = optimize.get_timeframe
        self.advise_sell = self.strategy.advise_sell
        self.advise_buy = self.strategy.advise_buy