merge conflict bug fix

Author: janvanrijn

openml/runs/functions.py

@@ -181,12 +181,6 @@ def _run_task_get_arffcontent(model, task, class_labels):
                 if version_complies(3, 3):
                     modelfit_duration = (time.process_time() - modelfit_starttime) * 1000
                     user_defined_measures['usercpu_time_millis_training'][rep_no][fold_no] = modelfit_duration
-
-                if isinstance(model_fold, sklearn.model_selection._search.BaseSearchCV):
-                    arff_tracecontent.extend(_extract_arfftrace(model_fold, rep_no, fold_no))
-                    model_classes = model_fold.best_estimator_.classes_
-                else:
-                    model_classes = model_fold.classes_
             except AttributeError as e:
                 # typically happens when training a regressor on classification task
                 raise PyOpenMLError(str(e))