Skip to content
  • Alexander David Hellwig's avatar
    Merge branch 'master' into ML_clustering · addae100
    Alexander David Hellwig authored
    # Conflicts:
    #	README.md
    #	pom.xml
    #	src/main/java/de/monticore/lang/monticar/generator/middleware/DistributedTargetGenerator.java
    #	src/main/java/de/monticore/lang/monticar/generator/middleware/cli/DistributedTargetGeneratorCli.java
    #	src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/RosHelper.java
    #	src/test/java/de/monticore/lang/monticar/generator/middleware/GenerationTest.java
    addae100