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 3e7ad394 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'feature/VECTO-1190-declaration-mode-for-heavy-buses_franz' into...

Merge branch 'feature/VECTO-1190-declaration-mode-for-heavy-buses_franz' into feature/VECTO-1190-declaration-mode-for-heavy-buses

# Conflicts:
#	VectoCommon/VectoCommon/BusAuxiliaries/IPneumaticUserInputsConfig.cs
#	VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
#	VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
#	VectoCommon/VectoCommon/Resources/XMLNames.resx
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV26InjectModule.cs
#	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/example_heavyBus_PIF.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-completed_heavyBus.xml
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj
parents eb782306 b5809b85
No related branches found
No related tags found
No related merge requests found
Showing
with 1381 additions and 53 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