From 83d20dd19985bc4e22117f73ea010310419d6ef0 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Mon, 24 Oct 2011 17:09:35 -0400 Subject: [PATCH] resolving merge --- sfa/rspecs/elements/versions/pgv2Link.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sfa/rspecs/elements/versions/pgv2Link.py b/sfa/rspecs/elements/versions/pgv2Link.py index 9ef6be41..1f19a7ad 100644 --- a/sfa/rspecs/elements/versions/pgv2Link.py +++ b/sfa/rspecs/elements/versions/pgv2Link.py @@ -6,9 +6,9 @@ from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements class PGv2Link: elements = { - 'link': RSpecElement(RSpecElements.LINK, 'link', '//default:link | //link'), -#thierry:was incomplete.. 'component_manager': RSpecElement(RSpecElement), - } + 'link': RSpecElement(RSpecElements.LINK, '//default:link | //link'), + 'component_manager': RSpecElement(RSpecElements.COMPONENT_MANAGER, './default:component_manager | ./component_manager') + } @staticmethod def add_links(xml, links): -- 2.43.0