fix missed

stash86 · May 14, 2024 · 22679dd · 22679dd
1 parent f4d87dc
commit 22679dd
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/freqtrade/data/converter/converter.py b/freqtrade/data/converter/converter.py
@@ -134,7 +134,6 @@ def ohlcv_fill_up_missing_data(dataframe: DataFrame, timeframe: str, pair: str)
     return df
 
 
-<<<<<<< HEAD
 def reduce_mem_usage(pair: str, dataframe: DataFrame) -> DataFrame:
     """ iterate through all the columns of a dataframe and modify the data type
         to reduce memory usage.
@@ -178,13 +177,9 @@ def reduce_mem_usage(pair: str, dataframe: DataFrame) -> DataFrame:
     return df
 
 
-def trim_dataframe(df: DataFrame, timerange, *, df_date_col: str = 'date',
-                   startup_candles: int = 0) -> DataFrame:
-=======
 def trim_dataframe(
     df: DataFrame, timerange, *, df_date_col: str = "date", startup_candles: int = 0
 ) -> DataFrame:
->>>>>>> b1fd79d720697f54014888874f11aa7befed7abe
     """
     Trim dataframe based on given timerange
     :param df: Dataframe to trim

diff --git a/freqtrade/data/dataprovider.py b/freqtrade/data/dataprovider.py
@@ -349,15 +349,7 @@ def get_required_startup(self, timeframe: str) -> int:
         return total_candles
 
     def get_pair_dataframe(
-<<<<<<< HEAD
-        self,
-        pair: str,
-        timeframe: Optional[str] = None,
-        candle_type: str = '',
-        startup_candle_count: int = 0
-=======
         self, pair: str, timeframe: Optional[str] = None, candle_type: str = ""
->>>>>>> b1fd79d720697f54014888874f11aa7befed7abe
     ) -> DataFrame:
         """
         Return pair candle (OHLCV) data, either live or cached historical -- depending