From: jsimomaa <jani.simomaa@gmail.com>
Date: Fri, 20 Jan 2017 11:44:23 +0000 (+0200)
Subject: Adding missing HasTypes for background compatibility
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=a7ad4ad4ad32dceccfa37dbec2734fb6fb43b326;p=simantics%2Fplatform.git

Adding missing HasTypes for background compatibility

Change-Id: If1903c1fca4f14ecbc99797001f9d752c24c7787
---

diff --git a/bundles/org.simantics.selectionview.ontology/graph.tg b/bundles/org.simantics.selectionview.ontology/graph.tg
index 7aa0ecdb2..440de44ea 100644
Binary files a/bundles/org.simantics.selectionview.ontology/graph.tg and b/bundles/org.simantics.selectionview.ontology/graph.tg differ
diff --git a/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph b/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
index 4275aa54b..8396e6cd4 100644
--- a/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
+++ b/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
@@ -32,6 +32,7 @@ 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
 
@@ -46,10 +47,14 @@ 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
 <<<<<<< 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.TypedVariableTabContribution.HasType --> L0.Type <R L0.DependsOn
+>>>>>>> d930828 Adding missing HasTypes for background compatibility
 
 SEL.HasDisplayColumn <R L0.HasProperty : L0.FunctionalRelation