From 772dfac670af58e20b66cad2ed045245a557d135 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 18 Oct 2012 17:07:44 -0400 Subject: [PATCH] merge --- sfa/planetlab/plaggregate.py | 7 ------- 1 file changed, 7 deletions(-) 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 - -- 2.43.0