Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 910589e0 authored by Michael KRISPER's avatar Michael KRISPER
Browse files

Merge branch 'develop' of...

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emkrispmi/vecto-sim into feature/VECTO-79-add-jobcontainer-or-similar

Conflicts:
	VectoCore/Models/Simulation/Data/ModalResult.cs
	VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
	VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
	VectoCore/Utils/SI.cs
	VectoCore/Utils/VectoCSVFile.cs
	VectoCore/VectoCore.csproj
	VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
	VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
	VectoCoreTest/TestData/Components/24t Coach.vgbx
	VectoCoreTest/VectoCoreTest.csproj
parents 84490828 dfc7420d
No related branches found
No related tags found
No related merge requests found
Showing
with 1081 additions and 188 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment