Merge branch 'develop' into feat/objectify-ccxt

scripts/plot_dataframe.py

@@ -27,7 +27,11 @@ from freqtrade import exchange
 import freqtrade.optimize as optimize
 
 
+<<<<<<< HEAD
 logger = logging.getLogger('freqtrade')
+=======
+logger = logging.getLogger(__name__)
+>>>>>>> bddf009a2b6d0e1a19cca558887ce972e99a6238
 
 
 def plot_analyzed_dataframe(args: Namespace) -> None:

scripts/plot_profit.py

@@ -24,13 +24,20 @@ import plotly.graph_objs as go
 from freqtrade.arguments import Arguments
 from freqtrade.configuration import Configuration
 from freqtrade.analyze import Analyze
+<<<<<<< HEAD
 from freqtrade.constants import Constants
+=======
+>>>>>>> bddf009a2b6d0e1a19cca558887ce972e99a6238
 
 import freqtrade.optimize as optimize
 import freqtrade.misc as misc
 
 
+<<<<<<< HEAD
 logger = logging.getLogger('freqtrade')
+=======
+logger = logging.getLogger(__name__)
+>>>>>>> bddf009a2b6d0e1a19cca558887ce972e99a6238
 
 
 # data:: [ pair,      profit-%,  enter,         exit,        time, duration]