From: jsimomaa <jani.simomaa@gmail.com>
Date: Thu, 12 Jan 2017 13:59:41 +0000 (+0200)
Subject: Enhancements to TabContributions
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=321dbeee506b06e56cc5c4a22d4ce5f70163bdf3;p=simantics%2Fplatform.git

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 383459e62..4275aa54b 100644
--- 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