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

Skip to content
Snippets Groups Projects
Commit 9d5b3971 authored by Markus QUARITSCH's avatar Markus QUARITSCH
Browse files

Merge branch 'simulatorFactory-refactoring' into merge/multistage_hybrid 

# Conflicts:
#	VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
#	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
#	VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
parents ca93c092 40f8ab75
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1112 additions and 73 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about