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

Skip to content
Snippets Groups Projects
Commit 4956e43b 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 Private/InvestigateLongrunningTests

Conflicts:
	VectoCore/Configuration/Constants.cs
	VectoCore/Models/SimulationComponent/Impl/Driver.cs
	VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
	VectoCoreTest/TestData/Results/Integration/job.vsum
parents fbdd00b6 9ad72b4b
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 839 additions and 620 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