diff --git a/src/base/jacobian.jl b/src/base/jacobian.jl index 1bcbd631d..aec1e75fe 100644 --- 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},