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

Skip to content
Snippets Groups Projects
Commit dde498e7 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'develop' of... 

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into feature/VECTO-57-implement-engine-model

Conflicts:
	VectoCore/Exceptions/VectoExceptions.cs
	VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
	VectoCore/Utils/DataRowExtensionMethods.cs
	VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
	VectoCoreTest/VectoCoreTest.csproj
parents 14205221 8b007f6e
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 483 additions and 318 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about