Fix a rebase

JuliaSmoothOptimizers · Aug 16, 2024 · 2e2f0bb · 2e2f0bb
1 parent 81150e9
commit 2e2f0bb
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/src/sparse_hessian.jl b/src/sparse_hessian.jl
@@ -1,19 +1,11 @@
-<<<<<<< HEAD
-struct SparseADHessian{Tag, R, T, C, S, GT} <: ADNLPModels.ADBackend
-=======
 struct SparseADHessian{Tag, R, T, C, H, S, GT} <: ADNLPModels.ADBackend
->>>>>>> f83a183 (Support acyclic coloring)
   nvar::Int
   rowval::Vector{Int}
   colptr::Vector{Int}
   nzval::Vector{R}
   result_coloring::C
-<<<<<<< HEAD
-  compressed_hessian::S
-=======
   coloring_mode::Symbol
   compressed_hessian::H
->>>>>>> f83a183 (Support acyclic coloring)
   seed::BitVector
   lz::Vector{ForwardDiff.Dual{Tag, T, 1}}
   glz::Vector{ForwardDiff.Dual{Tag, T, 1}}