From 7c80cc75610b1fd9d57a1163ba4e99df6009c82c Mon Sep 17 00:00:00 2001
From: ql0320 <qluo0320@gmail.com>
Date: Mon, 27 Nov 2023 15:18:12 -0500
Subject: [PATCH] Clean GenX.jl after merge

---
 src/GenX.jl | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/GenX.jl b/src/GenX.jl
index 5e03591ea2..7bd75fb736 100644
--- 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