# Conflicts:
#	HashingTool/Properties/Version.cs
#	VECTO/Configuration.vb
#	VECTO/GUI/GearboxForm.vb
#	VECTO/GUI/MainForm.Designer.vb
#	VECTO/GUI/MainForm.vb
#	VECTO/GUI/VectoJobForm.Designer.vb
#	VECTO/GUI/VectoJobForm.vb
#	VECTO/Input Files/Gearbox.vb
#	VECTO/Input Files/VectoJob.vb
#	VECTO/OutputData/JSONFileWriter.vb
#	VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
#	VECTOAux/VectoAuxiliariesTests/packages.config
#	VectoCommon/VectoCommon/Properties/Version.cs
#	VectoCommon/VectoHashing/Properties/Version.cs
#	VectoCommon/VectoHashingTest/VectoHashingTest.csproj
#	VectoConsole/Properties/Version.cs
#	VectoCore/VectoCore/InputData/Reader/ComponentData/DrivingCycleDataReader.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
#	VectoCore/VectoCore/Models/Simulation/ISimulationPreprocessor.cs
#	VectoCore/VectoCore/Models/Simulation/IVehicleContainer.cs
#	VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
#	VectoCore/VectoCore/OutputData/IModalDataContainer.cs
#	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
#	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
#	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
#	VectoCore/VectoCore/Properties/Version.cs
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCore/VersionNumber.t4
#	VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
#	VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
#	VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
#	VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxShiftLossesTest.cs
#	VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj