Skip to content

Commit 8444544

Browse files
authored
Merge branch 'master' into v12-nonlinear
2 parents 48d518c + d7f1459 commit 8444544

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

.codecov.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ ignore:
44
- 'src/gen95'
55
- 'src/gen100'
66
- 'src/gen110'
7+
- 'src/gen120'

src/Gurobi.jl

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,24 +64,24 @@ elseif _is_patch(_GUROBI_VERSION, v"12.0")
6464
else
6565
error(
6666
"""
67-
You have installed version $_GUROBI_VERSION of Gurobi, which is not
68-
supported by Gurobi.jl. We require Gurobi version 9.0 or 9.1 or 9.5
69-
or 10.0 or 11.0 or 12.0.
67+
You have installed version $_GUROBI_VERSION of Gurobi, which is not
68+
supported by Gurobi.jl. We require Gurobi version 9.0 or 9.1 or 9.5
69+
or 10.0 or 11.0 or 12.0.
7070
71-
After installing a supported version of Gurobi, run:
71+
After installing a supported version of Gurobi, run:
7272
73-
import Pkg
74-
Pkg.rm("Gurobi")
75-
Pkg.add("Gurobi")
73+
import Pkg
74+
Pkg.rm("Gurobi")
75+
Pkg.add("Gurobi")
7676
77-
Make sure you set the environment variable `GUROBI_HOME` following
78-
the instructions in the Gurobi.jl README, which is available at
79-
https://github.com/jump-dev/Gurobi.jl.
77+
Make sure you set the environment variable `GUROBI_HOME` following
78+
the instructions in the Gurobi.jl README, which is available at
79+
https://github.com/jump-dev/Gurobi.jl.
8080
81-
If you have a newer version of Gurobi installed, changes may need to be made
82-
to the Julia code. Please open an issue at
83-
https://github.com/jump-dev/Gurobi.jl.
84-
""",
81+
If you have a newer version of Gurobi installed, changes may need to be made
82+
to the Julia code. Please open an issue at
83+
https://github.com/jump-dev/Gurobi.jl.
84+
""",
8585
)
8686
end
8787

0 commit comments

Comments
 (0)