Clean GenX.jl after merge

GenXProject · Nov 27, 2023 · 7c80cc7 · 7c80cc7
1 parent eaeafa2
commit 7c80cc7
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/src/GenX.jl b/src/GenX.jl
@@ -36,16 +36,6 @@ using Combinatorics
 using Random
 using RecursiveArrayTools
 using Statistics
-<<<<<<< HEAD
-# using SparseArrays
-# Uncomment if Gurobi or CPLEX active license and installations are there and the user intends to use either of them
-#using CPLEX
-using Gurobi
-#using CPLEX
-#using MOI
-#using SCIP
-=======
->>>>>>> origin/develop
 using HiGHS
 
 # Global scaling factor used when ParameterScale is on to shift values from MW to GW