Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl')
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl24
1 files changed, 0 insertions, 24 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
index 0126195414d..dce9463f9ea 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
@@ -27,15 +27,7 @@
<ifExpr xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-<<<<<<< HEAD
-<<<<<<< HEAD
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5">
-=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
->>>>>>> - [Bug 420376] Generated C++ code is not formatted
-=======
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
->>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/6/Union">
@@ -222,15 +214,7 @@
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-<<<<<<< HEAD
-<<<<<<< HEAD
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/26">
-=======
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31">
->>>>>>> - [Bug 420376] Generated C++ code is not formatted
-=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31">
->>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
@@ -238,15 +222,7 @@
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-<<<<<<< HEAD
-<<<<<<< HEAD
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/27">
-=======
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
->>>>>>> - [Bug 420376] Generated C++ code is not formatted
-=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
->>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>

Back to the top