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

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

Merge branch 'develop' into feature/VECTO-1410-multistage-tool-buses 

# Conflicts:
#	VECTO.sln.DotSettings
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
#	VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReport.cs
#	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs
#	VectoCore/VectoCore/OutputData/XML/XMLMonitoringReport.cs
parents c5782a8d 9559abc8
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 124 additions and 186 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