diff options
Diffstat (limited to 'extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl')
-rw-r--r-- | extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl index 48d38fca763..3f959ab9cf8 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl @@ -8,14 +8,7 @@ <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> </input> <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/> -<<<<<<< HEAD -<<<<<<< HEAD -======= <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/> ->>>>>>> - [Bug 420376] Generated C++ code is not formatted -======= - <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/> ->>>>>>> refs/heads/Qompass <imports href="../CppPrimitiveTypes.emtl#/0"/> <imports href="../CppEnumerations.emtl#/0"/> <ownedModuleElement xsi:type="mtl:Template" name="TypeAndEnumForVisibility" visibility="Public"> |