fix jacobian change

NREL-Sienna · Jan 5, 2024 · 648b412 · 648b412
1 parent c1f8076
commit 648b412
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/base/jacobian.jl b/src/base/jacobian.jl
@@ -60,7 +60,6 @@ function (J::JacobianFunctionWrapper{HasDelays})(
 end
 
 function (J::JacobianFunctionWrapper{NoDelays})(
-<<<<<<< HEAD
     JM::U,
     x::AbstractVector{Float64},
     h,
@@ -72,8 +71,6 @@ function (J::JacobianFunctionWrapper{NoDelays})(
 end
 
 function (J::JacobianFunctionWrapper{NoDelays})(
-=======
->>>>>>> f336ececd8d00911b90d888d62e056bc05791fbf
     JM::U,
     dx::AbstractVector{Float64},
     x::AbstractVector{Float64},