From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Mon, 24 Oct 2011 21:09:35 +0000 (-0400)
Subject: resolving merge
X-Git-Tag: sfa-1.1-1~52
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=83d20dd19985bc4e22117f73ea010310419d6ef0;hp=0494e19e9c10be8212f07c37774f3af8b29cee4f;p=sfa.git

resolving merge
---

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):