Enhancements to TabContributions

Change-Id: I4df883661c0836a2b19288e7c9fd9456f16988fa

diff --git a/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph b/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
index 383459e628f5bc647df1cb2b39685873b01d8623..4275aa54b337a01301fa573ddc6d0d4dc0de9c44 100644 (file)
--- a/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
+++ b/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
@@ -32,7 +32,6 @@ SEL.AbstractVariableTabContribution <T SEL.TabContribution
 SEL.AbstractResourceTabContribution <T SEL.TabContribution
 
 SEL.AbstractTypedVariableTabContribution <T SEL.AbstractVariableTabContribution
-  >-- SEL.AbstractTypedVariableTabContribution.HasType --> L0.Type <R L0.DependsOn
 
 SEL.AbstractTypedResourceTabContribution <T SEL.AbstractResourceTabContribution
 
@@ -47,7 +46,10 @@ SEL.MultiTypedVariableTabContribution <T SEL.TypedVariableTabContribution
   @L0.assert SEL.TabContribution.Multi true
 
 SEL.TypedVariableTabContribution <T SEL.VariableTabContribution
+<<<<<<< Upstream, based on branch 'private/jsimomaa-district' of ssh://jsimomaa@www.simantics.org:29418/simantics/platform
   >-- SEL.TypedVariableTabContribution.HasType --> L0.Type <R L0.DependsOn
+=======
+>>>>>>> 0ae9719 Enhancements to TabContributions
 
 SEL.HasDisplayColumn <R L0.HasProperty : L0.FunctionalRelation