resolve conflict

Author: dengdifan

autoPyTorch/datasets/time_series_dataset.py

@@ -699,13 +699,8 @@ def __init__(self,
                 valid_splits.append(split)
 
         if len(valid_splits) == 0:
-<<<<<<< HEAD
             raise ValueError(f'The passed value for {n_prediction_steps} is unsuited for the current dataset, please '
                              'consider reducing n_prediction_steps')
-=======
-            raise ValueError('The forecasting horizon setting is unsuited for the Current dataset, please '
-                             'considering reducing n_prediction_steps')
->>>>>>> ee2ff5c3 (maint)
 
         self.splits = valid_splits