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

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

Merge branch 'develop' of...

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

Conflicts:
	VectoCore/VectoCore.csproj
	VectoCoreTest/Models/UnitTest1.cs
parents 271b4bdc 5b3c9f46
No related branches found
No related tags found
No related merge requests found
Showing
with 553 additions and 372 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment