Commit 039f9fd2 authored by Markus Georg Bendel's avatar Markus Georg Bendel
Browse files

Merge branch 'integrate-someip' into 'master'

# Conflicts:
#   pom.xml
#   src/main/java/de/monticore/lang/monticar/generator/middleware/cli/
parents 59868f08 231f6e4c
Pipeline #188880 failed with stages
in 3 minutes and 11 seconds
Markdown is supported
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