Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Forked from VECTO / VECTO Sim
Source project has a limited visibility.
  • Markus Quaritsch's avatar
    2e86e615
    Merge branch 'develop' into feature/VECTO-1648-BusAux-adaptations · 2e86e615
    Markus Quaritsch authored
    # Conflicts:
    #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
    #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs
    #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs
    #	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
    #	VectoCore/VectoCore/Models/SimulationComponent/Data/Battery/BatteryData.cs
    #	VectoCore/VectoCore/OutputData/IModalDataContainer.cs
    #	VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs
    #	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
    #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b.vecto
    #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
    #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
    2e86e615
    History
    Merge branch 'develop' into feature/VECTO-1648-BusAux-adaptations
    Markus Quaritsch authored
    # Conflicts:
    #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
    #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs
    #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs
    #	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
    #	VectoCore/VectoCore/Models/SimulationComponent/Data/Battery/BatteryData.cs
    #	VectoCore/VectoCore/OutputData/IModalDataContainer.cs
    #	VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs
    #	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
    #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b.vecto
    #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
    #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
Code owners
Assign users and groups as approvers for specific file changes. Learn more.