Merge branch 'master' into ML_clustering
# Conflicts: # src/main/java/de/monticore/lang/monticar/generator/middleware/DistributedTargetGenerator.java # src/main/java/de/monticore/lang/monticar/generator/middleware/clustering/ClusterFromTagsHelper.java # src/test/java/de/monticore/lang/monticar/generator/middleware/ClusterTest.java
Showing