diff --git a/fedot/api/api_utils/assumptions/task_assumptions.py b/fedot/api/api_utils/assumptions/task_assumptions.py index a1fbcc0a2c..857a640ef9 100644 --- a/fedot/api/api_utils/assumptions/task_assumptions.py +++ b/fedot/api/api_utils/assumptions/task_assumptions.py @@ -58,8 +58,6 @@ def builders(self): PipelineBuilder() .add_branch('polyfit', 'lagged') .grow_branches(None, 'ridge') -<<<<<<< Updated upstream -<<<<<<< Updated upstream .join_branches('ridge'), 'smoothing_ar': PipelineBuilder() @@ -67,21 +65,10 @@ def builders(self): 'gru': PipelineBuilder() .add_branch('gru', 'lagged') -======= -<<<<<<< Updated upstream -======= ->>>>>>> Stashed changes - .join_branches('ridge') -======= .join_branches('ridge'), 'gru': PipelineBuilder() .add_sequence('lagged', 'gru') ->>>>>>> Stashed changes -<<<<<<< Updated upstream ->>>>>>> Stashed changes -======= ->>>>>>> Stashed changes } def ensemble_operation(self) -> str: