Update local_improvement_search.jl

odow · Nov 14, 2023 · 2c4ea2e · 2c4ea2e
1 parent 8a39b20
commit 2c4ea2e
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/plugins/local_improvement_search.jl b/src/plugins/local_improvement_search.jl
@@ -82,12 +82,7 @@ function minimize(
         # more of a bottleneck.)
         pₖ = B \ -∇fₖ
         # Run line search in direction `pₖ`
-<<<<<<< Updated upstream
         αₖ, fₖ₊₁, ∇fₖ₊₁ = _line_search(f, fₖ, ∇fₖ, xₖ, pₖ, αₖ, evals)
-=======
-        αₖ, fₖ₊₁, ∇fₖ₊₁ =
-            _line_search(f, fₖ, ∇fₖ, xₖ, pₖ, αₖ, evals)
->>>>>>> Stashed changes
         if _norm(αₖ * pₖ) / max(1.0, _norm(xₖ)) < 1e-3
             # Small steps! Probably at the edge of the feasible region.
             # Return the current iterate.