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 b76a1b44 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'dev/AMT_ShiftStrategy' into... 

Merge branch 'dev/AMT_ShiftStrategy' into feature/VECTO-737-calculation-of-additional-engine-fld-parameters

# Conflicts:
#	VectoCore/VectoCore/Models/Declaration/LookupData.cs
#	VectoCore/VectoCore/Models/Declaration/Segments.cs
parents 6c9fc611 62a37349
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2673 additions and 2581 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