# Conflicts:
#	pom.xml
#	src/main/java/de/monticore/lang/monticar/generator/cpp/GeneratorCPP.java
#	src/main/java/de/monticore/lang/monticar/generator/cpp/GeneratorCppCli.java
#	src/main/java/de/monticore/lang/monticar/generator/order/nfp/TagThresholdTagSchema/TagThresholdSymbolCreator.java