Fix rebase conflict.

nortikin · Aug 31, 2024 · 8e59099 · 8e59099
1 parent 44e75d0
commit 8e59099
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/nodes/curve/blend_curves.py b/nodes/curve/blend_curves.py
@@ -188,11 +188,9 @@ def process(self):
             new_curves = []
             new_controls = []
             for curve1, curve2, factor1, factor2, parameter in params:
-<<<<<<< HEAD
                 if len(params)==1 and curve1==curve2 and self.cyclic==False:
                     if self.output_src:
                         new_curves.append(curve1)
-=======
                 _, t_max_1 = curve1.get_u_bounds()
                 t_min_2, _ = curve2.get_u_bounds()
 
@@ -269,7 +267,7 @@ def process(self):
                                     normal_1_end, normal_2_begin,
                                     curvature_1_end, curvature_2_begin)
                     controls = new_curve.get_control_points().tolist()
->>>>>>> 7b578d5a3 ("Blend Curves": G2 mode.)
+
                 else:
                     _, t_max_1 = curve1.get_u_bounds()
                     t_min_2, _ = curve2.get_u_bounds()