Conflict resolution on main

GenXProject · Apr 27, 2023 · f6ed566 · f6ed566
1 parent 7bec14b
commit f6ed566
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Settings/highs_settings.yml b/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Settings/highs_settings.yml
@@ -10,4 +10,4 @@ Method: ipm             #HiGHS-specific solver settings # Solver option: "simple
 
 # Run the crossover routine for IPX
 # [type: bool, advanced: true, range: {false, true}, default: true]
-run_crossover: off
+run_crossover: off
diff --git a/...le_Systems/RealSystemExample/MGA_ISONE_Trizone_FullTimeseries/Settings/highs_settings.yml b/...le_Systems/RealSystemExample/MGA_ISONE_Trizone_FullTimeseries/Settings/highs_settings.yml
@@ -11,4 +11,3 @@ Method: ipm            #HiGHS-specific solver settings # Solver option: "simplex
 # Run the crossover routine for IPX
 # [type: bool, advanced: true, range: {false, true}, default: true]
 run_crossover: off
-
diff --git a/Example_Systems/SmallNewEngland/OneZone_MultiStage/Settings/highs_settings.yml b/Example_Systems/SmallNewEngland/OneZone_MultiStage/Settings/highs_settings.yml
@@ -11,4 +11,3 @@ Method: ipm             #HiGHS-specific solver settings # Solver option: "simple
 # Run the crossover routine for IPX
 # [type: bool, advanced: true, range: {false, true}, default: true]
 run_crossover: off
-
diff --git a/Example_Systems/SmallNewEngland/Simple_Test_Case/Settings/highs_settings.yml b/Example_Systems/SmallNewEngland/Simple_Test_Case/Settings/highs_settings.yml
@@ -10,4 +10,4 @@ Method: choose             #HiGHS-specific solver settings # Solver option: "sim
 
 # Run the crossover routine for IPX
 # [type: bool, advanced: true, range: {false, true}, default: true]
-run_crossover: "off"
+run_crossover: off
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,3 @@ Method: ipm #HiGHS-specific solver settings # Solver option: "simplex
		# Run the crossover routine for IPX
		# [type: bool, advanced: true, range: {false, true}, default: true]
		run_crossover: off