From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 18 Oct 2012 21:07:44 +0000 (-0400)
Subject: merge
X-Git-Tag: sfa-3.0-0~111
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=772dfac670af58e20b66cad2ed045245a557d135;p=sfa.git

merge
---

diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py
index ece53ba0..944d20a1 100644
--- a/sfa/planetlab/plaggregate.py
+++ b/sfa/planetlab/plaggregate.py
@@ -372,13 +372,6 @@ class PlAggregate:
             rspec.version.add_leases(leases)
 
                
-<<<<<<< HEAD:sfa/planetlab/plaggregate.py
         return {'geni_urn': urns[0], 
                 'geni_rspec': rspec.toxml(),
                 'geni_slivers': geni_slivers}
-=======
-        return  {'geni_urn': urns[0],
-                 'geni_rspec': rspec.toxml(),
-                 'geni_slivers': geni_slivers}
->>>>>>> 3acb26e0ac5bc5de68effe62d0878ba674e40369:sfa/planetlab/plaggregate.py
-