Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mlubin committed Feb 7, 2017
1 parent b4789f6 commit c797259
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/GLPKInterfaceLP.jl
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function Base.copy(m::GLPKMathProgModelLP)

GLPK.copy_prob(m2inner, m.inner, GLPK.ON)

return GLPKMathProgModelLP(m2inner, m.method, deepcopy(m.param))
return GLPKMathProgModelLP(m2inner, m.method, deepcopy(m.param), m.infeasible_bounds)
end

function LinearQuadraticModel(s::GLPKSolverLP)
Expand Down

0 comments on commit c797259

Please sign in to comment.