Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 7a698c3b 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/DirectAuxiliary.cs
	VectoCore/Models/SimulationComponent/Impl/MappingAuxiliary.cs
	VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
parents 3dd98941 b952a5eb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 365 additions and 100 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