resolve conflict

AntaresSimulatorTeam · Jan 30, 2024 · 6a653cd · 6a653cd
1 parent ffd251e
commit 6a653cd
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/cpp/benders/benders_core/include/common.h b/src/cpp/benders/benders_core/include/common.h
@@ -49,7 +49,6 @@ typedef std::vector<ActiveCut> ActiveCutStorage;
 typedef std::pair<std::string, std::string> mps_coupling;
 typedef std::list<mps_coupling> mps_coupling_list;
 
-enum class BENDERSMETHOD { BENDERS, BENDERSBYBATCH, MERGEMPS };
 
 struct Predicate {
   bool operator()(PointPtr const &lhs, PointPtr const &rhs) const {