fix merge conflicts after rebase

Author: ravinkohli

autoPyTorch/api/base_task.py

@@ -306,14 +306,7 @@ def _get_dataset_input_validator(
         y_train: Union[List, pd.DataFrame, np.ndarray],
         X_test: Optional[Union[List, pd.DataFrame, np.ndarray]] = None,
         y_test: Optional[Union[List, pd.DataFrame, np.ndarray]] = None,
-<<<<<<< HEAD
         resampling_strategy: Optional[ResamplingStrategies] = None,
-=======
-        resampling_strategy: Optional[Union[
-            CrossValTypes,
-            HoldoutValTypes,
-            NoResamplingStrategyTypes]] = None,
->>>>>>> rebase and fix flake
         resampling_strategy_args: Optional[Dict[str, Any]] = None,
         dataset_name: Optional[str] = None,
         dataset_compression: Optional[DatasetCompressionSpec] = None,
@@ -360,14 +353,7 @@ def get_dataset(
         y_train: Union[List, pd.DataFrame, np.ndarray],
         X_test: Optional[Union[List, pd.DataFrame, np.ndarray]] = None,
         y_test: Optional[Union[List, pd.DataFrame, np.ndarray]] = None,
-<<<<<<< HEAD
         resampling_strategy: Optional[ResamplingStrategies] = None,
-=======
-        resampling_strategy: Optional[Union[
-            CrossValTypes,
-            HoldoutValTypes,
-            NoResamplingStrategyTypes]] = None,
->>>>>>> rebase and fix flake
         resampling_strategy_args: Optional[Dict[str, Any]] = None,
         dataset_name: Optional[str] = None,
         dataset_compression: Optional[DatasetCompressionSpec] = None,
@@ -1480,14 +1466,7 @@ def fit_pipeline(
         X_test: Optional[Union[List, pd.DataFrame, np.ndarray]] = None,
         y_test: Optional[Union[List, pd.DataFrame, np.ndarray]] = None,
         dataset_name: Optional[str] = None,
-<<<<<<< HEAD
         resampling_strategy: Optional[Union[HoldoutValTypes, CrossValTypes, NoResamplingStrategyTypes]] = None,
-=======
-        resampling_strategy: Optional[Union[
-            CrossValTypes,
-            HoldoutValTypes,
-            NoResamplingStrategyTypes]] = None,
->>>>>>> rebase and fix flake
         resampling_strategy_args: Optional[Dict[str, Any]] = None,
         run_time_limit_secs: int = 60,
         memory_limit: Optional[int] = None,