Accidentally merged the git markers

Author: GearsAD

src/entities/DFGFactor.jl

@@ -49,26 +49,14 @@ end
 
 label(f::F) where F <: DFGFactor = f.label
 data(f::F) where F <: DFGFactor = f.data
-<<<<<<< Updated upstream
-id(f::F) where F <: DFGFactor = f._internalId
-=======
 tags(f::F) where F <: DFGFactor = f.tags
 internalId(f::F) where F <: DFGFactor = f._internalId
-"""
-    $SIGNATURES
-
-Retrieve data structure stored in a node.
-"""
-getData(v::DFGFactor)::GenericFunctionNodeData = v.data
->>>>>>> Stashed changes
 
 # Simply for convenience - don't export
 const PackedFunctionNodeData{T} = GenericFunctionNodeData{T, <: AbstractString}
 PackedFunctionNodeData(x1, x2, x3, x4, x5::S, x6::T, x7::String="", x8::Vector{Int}=Int[]) where {T <: PackedInferenceType, S <: AbstractString} = GenericFunctionNodeData(x1, x2, x3, x4, x5, x6, x7, x8)
 const FunctionNodeData{T} = GenericFunctionNodeData{T, Symbol}
 FunctionNodeData(x1, x2, x3, x4, x5::Symbol, x6::T, x7::String="", x8::Vector{Int}=Int[]) where {T <: Union{FunctorInferenceType, ConvolutionObject}}= GenericFunctionNodeData{T, Symbol}(x1, x2, x3, x4, x5, x6, x7, x8)
-<<<<<<< Updated upstream
-=======
 
 """
     $(SIGNATURES)
@@ -85,4 +73,3 @@ label(f::DFGFactorSummary) = f.label
 data(f::DFGFactorSummary) = f.data
 tags(f::DFGFactorSummary) = f.tags
 internalId(f::DFGFactorSummary) = f._internalId
->>>>>>> Stashed changes