Commit 81fc6c0f authored by Jonathon Duerig's avatar Jonathon Duerig

Merged modified GeniXML into master

parent 60781888
......@@ -228,12 +228,15 @@ sub GetVirtualId($)
return GetText("virtual_id", $node) ||
GetText("nickname", $node) ||
GetText("client_id", $node);
<<<<<<< Updated upstream:protogeni/lib/GeniXML.pm.in
}
sub GetSliverId($)
{
my ($node) = @_;
return GetText("sliver_urn", $node);
=======
>>>>>>> Stashed changes:protogeni/lib/GeniXML.pm.in
}
sub GetManagerId($)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment