VECTO.sln.DotSettings · 08fb543f0af580825b5c19dcd4bbf0bca2afc1fd · VECTO / Guests / VECTO Sim Tobia

Something went wrong on our end

Blame

Forked from VECTO / VECTO Sim

Source project has a limited visibility.

3 years ago

7e54544c

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

Markus QUARITSCH authored 3 years ago

# 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

7e54544c

History

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

Markus QUARITSCH authored 3 years ago

# 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

Code owners

Assign users and groups as approvers for specific file changes. Learn more.