Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgolubev2012-04-29 17:35:20 +0000
committermgolubev2012-04-29 17:35:20 +0000
commit51206e54ddf02b2ee71d49e21bd573d1ea30222b (patch)
treee55624a1f4d9ab4b4b193514c4aa8284f89a0e4a
parent69884d6aa4647927560322608c5bc853d37f1996 (diff)
downloadorg.eclipse.gmf-tooling-51206e54ddf02b2ee71d49e21bd573d1ea30222b.tar.gz
org.eclipse.gmf-tooling-51206e54ddf02b2ee71d49e21bd573d1ea30222b.tar.xz
org.eclipse.gmf-tooling-51206e54ddf02b2ee71d49e21bd573d1ea30222b.zip
completing the merge for failed cherry pick
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java2
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java3
2 files changed, 1 insertions, 4 deletions
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java
index 85ffcc2b0..32fc031cc 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java
@@ -2100,7 +2100,7 @@ public interface GMFMapPackage extends EPackage {
* @see org.eclipse.gmf.mappings.impl.GMFMapPackageImpl#getVisualEffectMapping()
* @generated
*/
- int VISUAL_EFFECT_MAPPING = 37;
+ int VISUAL_EFFECT_MAPPING = 11137;
/**
* The feature id for the '<em><b>Diagram Pin</b></em>' reference.
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java
index d4bc76d3b..9316fa67a 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java
@@ -58,10 +58,7 @@ import org.eclipse.gmf.mappings.Severity;
import org.eclipse.gmf.mappings.ToolOwner;
import org.eclipse.gmf.mappings.TopNodeReference;
import org.eclipse.gmf.mappings.ValueExpression;
-<<<<<<< OURS
-=======
import org.eclipse.gmf.mappings.VisualEffectMapping;
->>>>>>> THEIRS
import org.eclipse.gmf.tooldef.GMFToolPackage;
import org.eclipse.gmf.validate.GMFValidator;

Back to the top