-
Alexander David Hellwig authored
Conflicts: src/main/java/de/monticore/lang/monticar/generator/cpp/template/AllTemplates.java src/main/java/de/monticore/lang/monticar/generator/cpp/GeneratorCppCli.java
1c1adbf6
Conflicts: src/main/java/de/monticore/lang/monticar/generator/cpp/template/AllTemplates.java src/main/java/de/monticore/lang/monticar/generator/cpp/GeneratorCppCli.java