Merge remote-tracking branch 'origin/v90-bugfix'

scipopt · Jan 25, 2024 · 25bd450 · 25bd450
2 parents ec54ab6 + c25b457
commit 25bd450
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/scip/branch_gomory.c b/src/scip/branch_gomory.c
@@ -63,7 +63,7 @@
 #include "scip/scip_numerics.h"
 #include "scip/scip_lp.h"
 #include "scip/scip_tree.h"
-#include "scip_param.h"
+#include "scip/scip_param.h"
 #include "scip/branch_relpscost.h"
 #include <string.h>
 #include <assert.h>

diff --git a/src/scip/sepa_gomory.c b/src/scip/sepa_gomory.c
@@ -80,7 +80,6 @@
 #include "scip/scip_tree.h"
 #include "scip/scip_var.h"
 #include "scip/sepa_gomory.h"
-#include "struct_history.h"
 #include <string.h>
 
 #define SEPA_NAME              "gomory"