Skip to content

Commit 9fe8591

Browse files
Joao-DionisioJoao-Dionisio
authored
fix conflict
1 parent 7ccee04 commit 9fe8591

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

‎CHANGELOG.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
## Unreleased
44
### Added
55
- Added getLinearConsIndicator
6-
<<<<<<< HEAD
76
- Added SCIP_LPPARAM, setIntParam, setRealParam, getIntParam, getRealParam, isOptimal, getObjVal, getRedcost for lpi
8-
=======
9-
- Added SCIP_LPPARAM, setIntParam, setRealParam, getIntParam, getRealParam for lpi
10-
>>>>>>> upstream/master
117
- Added isFeasPositive
128
### Fixed
139
### Changed

0 commit comments

Comments
 (0)