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

Skip to content
Snippets Groups Projects
Commit 4f9f344c 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-70-wheels-engine-only-driving-cycle

Conflicts:
	VectoCore/Models/SimulationComponent/Impl/Driver.cs
	VectoCore/VectoCore.csproj
	VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
parents eb7d83a4 4966b5c9
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1769 additions and 961 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