• Malte Heithoff's avatar
    Merge branch 'master' into ExecutionSemantics · 4fb1dac7
    Malte Heithoff authored
    # 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
    4fb1dac7
pom.xml 10.3 KB