Commit 4fb1dac7 authored by Malte Heithoff's avatar Malte Heithoff
Browse files

Merge branch 'master' into ExecutionSemantics

# Conflicts:
#	pom.xml
#	src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/instanceStructure/EMAComponentInstanceBuilder.java
#	src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/instanceStructure/EMAComponentInstanceSymbolCreator.java
parents 68a2f706 d0c18bff
Pipeline #392207 failed with stage
in 22 seconds