Skip to content

Commit

Permalink
fixed typo
Browse files Browse the repository at this point in the history
  • Loading branch information
Qfl3x committed Sep 12, 2023
1 parent f949df1 commit 52933a0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/componentarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ ComponentVector{Float64}(a = 1.2, h = 4.0, b = 2.3)
"""
Base.merge(ca::ComponentVector) = ca
function Base.merge(ca1::ComponentVector{T1}, ca2::ComponentVector{T2}) where {T1, T2}
promoted_ca1 = ComponentVector{promot_type(T1, T2)}(ca1)
promoted_ca1 = ComponentVector{promote_type(T1, T2)}(ca1)
ComponentVector(promoted_ca1; ca2...)
end
Base.merge(ca1::ComponentVector, ca2::ComponentVector, cs::ComponentVector) = merge(merge(ca1,ca2), others...)
Base.merge(ca1::ComponentVector, ca2::ComponentVector, cs::ComponentVector) = merge(merge(ca1,ca2), others...)

0 comments on commit 52933a0

Please sign in to comment.