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

Skip to content
Snippets Groups Projects
Commit 128e7228 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/API_adaptations

Conflicts:
	VectoCommon/VectoCommon/VectoCommon.csproj
	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
	VectoCore/VectoCore/InputData/Reader/Impl/EngineOnlyVectoRunDataFactory.cs
	VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
	VectoCore/VectoCore/Models/Declaration/StandardBodies.cs
	VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs
	VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
	VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
parents 4e6a285b bce9ff9c
No related branches found
No related tags found
No related merge requests found
Showing
with 1615 additions and 23 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