Skip to content

Commit 789f498

Browse files
Fix formatting after resolving merge conflict
1 parent 6da0eb5 commit 789f498

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

scene/resources/animation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ class Animation : public Resource {
573573
static Variant interpolate_variant(const Variant &a, const Variant &b, float c, bool p_snap_array_element = false);
574574
static Variant cubic_interpolate_in_time_variant(const Variant &pre_a, const Variant &a, const Variant &b, const Variant &post_b, float c, real_t p_pre_a_t, real_t p_b_t, real_t p_post_b_t, bool p_snap_array_element = false);
575575
static Variant monotonic_cubic_interpolate_in_time_variant(const Variant &pre_a, const Variant &a, const Variant &b, const Variant &post_b, float c, real_t p_pre_a_t, real_t p_b_t, real_t p_post_b_t, bool p_snap_array_element = false);
576-
/// @}
576+
/// @}
577577
static bool is_less_or_equal_approx(double a, double b) {
578578
return a < b || Math::is_equal_approx(a, b);
579579
}

0 commit comments

Comments
 (0)