Commit e71caed9 authored by Malte Heithoff's avatar Malte Heithoff
Browse files

Merge remote-tracking branch 'origin/StartValueExtension' into StartValueExtension

# Conflicts:
#	src/main/java/de/monticore/lang/embeddedmontiarc/cocos/InitialGuessIsAssignment.java
#	src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/instanceStructure/EMAComponentInstanceBuilder.java
parents 3dd8d1cd 91f852cf
Supports Markdown
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