Fix

aimclub · Sep 6, 2023 · e79434d · e79434d
1 parent cfa4e58
commit e79434d
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/fedot/api/api_utils/assumptions/task_assumptions.py b/fedot/api/api_utils/assumptions/task_assumptions.py
@@ -58,30 +58,17 @@ def builders(self):
                 PipelineBuilder()
                 .add_branch('polyfit', 'lagged')
                 .grow_branches(None, 'ridge')
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
                 .join_branches('ridge'),
             'smoothing_ar':
                 PipelineBuilder()
                 .add_sequence('smoothing', 'ar'),
             '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: