Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 0154ad5d authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'master' of... 

Merge branch 'master' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into develop

Conflicts:
	VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
	VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
	VectoCore/VectoCore/Utils/VectoCSVFile.cs
	VectoCore/VectoCoreTest/FileIO/JsonTest.cs
parents 275215a5 79a0cf31
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 215 additions and 26 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