resolving merge

diff --git a/sfa/rspecs/elements/versions/pgv2Link.py b/sfa/rspecs/elements/versions/pgv2Link.py
index 9ef6be4..1f19a7a 100644 (file)
--- 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):