upgraded graphing script to work with latest version of objectivity

2018-05-09 05:16:05 -07:00
parent 478b0803d6
commit 9d844696f9
1 changed files with 0 additions and 4 deletions
--- a/scripts/plot_dataframe.py
+++ b/scripts/plot_dataframe.py
@@ -27,11 +27,7 @@ from freqtrade.analyze import Analyze
 from freqtrade.arguments import Arguments
 from freqtrade.configuration import Configuration

-<<<<<<< HEAD
 logger = logging.getLogger('freqtrade')
-=======
-logger = logging.getLogger(__name__)
->>>>>>> bddf009a2b6d0e1a19cca558887ce972e99a6238

 def plot_dataframes_markers(data, fig, args):
    """