Merge branch... (7dc1197e) · Commits · Stefanos DOUMPOULAKIS / Vecto

Commit 7dc1197e authored 2 years ago by Markus Quaritsch

Merge branch...

Merge branch 'hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/hm_vecto-dev into hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev

# Conflicts:
#	VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh

parents 183c0a8c f8ab9029

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPC__Gbx3.vecto 0 additions, 0 deletions

...Mode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPC__Gbx3.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPC__Gbx3_drag.vecto 0 additions, 0 deletions

...JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPC__Gbx3_drag.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_.vecto 0 additions, 0 deletions

...e/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__3speed.vecto 0 additions, 0 deletions

...mendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__3speed.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__3speed_PTO.vecto 0 additions, 0 deletions

...mDeclMode/JSON/PEV/GenericVehicleB2/BEV__3speed_PTO.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__BusAux.vecto 0 additions, 0 deletions

...mendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__BusAux.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__Cont30kW.vecto 0 additions, 0 deletions

...ndmDeclMode/JSON/PEV/GenericVehicleB2/BEV__Cont30kW.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle.vveh 1 addition, 1 deletion

...ode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh 1 addition, 1 deletion

...PEV/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle_PTO.vveh 1 addition, 1 deletion

...JSON/PEV/GenericVehicleB2/BatteryElectricVehicle_PTO.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh 1 addition, 1 deletion

...e/JSON/PEV/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl.vveh 1 addition, 1 deletion

...ode/JSON/PEV/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl_APTP.vveh 1 addition, 1 deletion

...SON/PEV/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl_APTP.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BEV_.vecto 0 additions, 0 deletions

...e/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BEV_.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BEV__Cont30kW.vecto 0 additions, 0 deletions

...ndmDeclMode/JSON/PEV/GenericVehicleB3/BEV__Cont30kW.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BatteryElectricVehicle.vveh 1 addition, 1 deletion

...ode/JSON/PEV/GenericVehicleB3/BatteryElectricVehicle.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh 1 addition, 1 deletion

...PEV/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BEV_.vecto 0 additions, 0 deletions

...e/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BEV_.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BEV__Cont30kW.vecto 0 additions, 0 deletions

...ndmDeclMode/JSON/PEV/GenericVehicleB4/BEV__Cont30kW.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BatteryElectricVehicle.vveh 1 addition, 1 deletion

...ode/JSON/PEV/GenericVehicleB4/BatteryElectricVehicle.vveh

with 9 additions and 9 deletions

Please register or to comment