Resolve Conflicts while merge
Showing
- VECTO/GUI/VehicleForm.vb 5 additions, 3 deletionsVECTO/GUI/VehicleForm.vb
- VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs 2 additions, 5 deletions...ore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
- VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs 5 additions, 23 deletions...re/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
- VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs 3 additions, 5 deletions...Core/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
Loading
Please register or sign in to comment