From 7ca0babc3daee8ae4cf4b8895ac18b39c22d021a Mon Sep 17 00:00:00 2001
From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at>
Date: Tue, 24 May 2022 17:21:55 +0200
Subject: [PATCH] fixed merge conflict

---
 VectoCommon/VectoCommon/InputData/EngineeringInputData.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
index aa928cde62..d0c84a81b2 100644
--- a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
@@ -60,9 +60,7 @@ namespace TUGraz.VectoCommon.InputData
 		BatteryElectricVehicle,
 		IEPC_E,
 		IEPC_S,
-		EngineOnlySimulation,
-		IEPC_E,
-		IEPC_S
+		EngineOnlySimulation
 	}
 
 	public interface IHybridStrategyParameters
-- 
GitLab