Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Dumoulin2014-01-15 15:25:16 +0000
committerCedric Dumoulin2014-01-27 13:54:07 +0000
commit9bd07b14be4e5db791ed18af13a928e840a8026d (patch)
tree409bc3f5c1fb34a6c0af6ae85ca43b6ad8649c69 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF
parentcf00638fd3bf869039e17e4d3b72b2393d92d7bf (diff)
downloadorg.eclipse.papyrus-9bd07b14be4e5db791ed18af13a928e840a8026d.tar.gz
org.eclipse.papyrus-9bd07b14be4e5db791ed18af13a928e840a8026d.tar.xz
org.eclipse.papyrus-9bd07b14be4e5db791ed18af13a928e840a8026d.zip
330199 - Take master version of the file to resolve conflict.
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF')
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF1
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
index 80991b1c221..93448b3a1b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
@@ -103,4 +103,3 @@ Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.Activator
Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common;singleton:
=true
-

Back to the top