VECTO.sln.DotSettings · 1711bb6141c590a80c7e86638b7f522278e13493 · 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

6d46a8a0

Merge branch 'develop' into test · 6d46a8a0

Markus QUARITSCH authored 3 years ago

# Conflicts:
#	VECTO/Input Files/Engine.vb
#	VECTO/Input Files/Vehicle.vb
#	VectoCommon/VectoCommon/BusAuxiliaries/ISSMDeclarationInputs.cs
#	VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/IXMLDeclarationInputDataReader.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs
#	VectoCore/VectoCore/VectoCore.csproj

6d46a8a0

History

Merge branch 'develop' into test

Markus QUARITSCH authored 3 years ago

# Conflicts:
#	VECTO/Input Files/Engine.vb
#	VECTO/Input Files/Vehicle.vb
#	VectoCommon/VectoCommon/BusAuxiliaries/ISSMDeclarationInputs.cs
#	VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/IXMLDeclarationInputDataReader.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs
#	VectoCore/VectoCore/VectoCore.csproj

Code owners

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