Try and remove conflict

peternewell · peternewell · commit e6b940957fa8 · 2023-12-25T17:30:14.000+11:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -2008,7 +2008,6 @@ public override void Update(float elapsedClockSeconds)
 
             // Cruise Control
             CruiseControl?.Update(elapsedClockSeconds);
-
             // TODO  this is a wild simplification for electric and diesel electric
             if (EngineType == EngineTypes.Diesel || EngineType == EngineTypes.Electric)
             {

Original file line number	Diff line number	Diff line change
`@@ -2008,7 +2008,6 @@ public override void Update(float elapsedClockSeconds)`
`2008`	`2008`
`2009`	`2009`	`// Cruise Control`
`2010`	`2010`	`CruiseControl?.Update(elapsedClockSeconds);`
`2011`		`-`
`2012`	`2011`	`// TODO this is a wild simplification for electric and diesel electric`
`2013`	`2012`	`if (EngineType == EngineTypes.Diesel \|\| EngineType == EngineTypes.Electric)`
`2014`	`2013`	`{`