resolve conflict manually
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Wed, 13 Oct 2010 14:56:24 +0000 (16:56 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Wed, 13 Oct 2010 14:56:24 +0000 (16:56 +0200)
commit99e9f96209b9ebfd1853e7b8902a1a0fe893eaa2
treece0df0c9b796f7f7c471157619d40d3b6ef98e01
parentb5274259ddb8f0582b42ad760ed01280c2c2e407
parent6014de6020ea30f61729499df1e98e1b801e73f0
resolve conflict manually
sfa/client/sfi.py
sfa/managers/aggregate_manager_pl.py
sfa/managers/registry_manager_pl.py
sfa/managers/slice_manager_pl.py
sfa/methods/RenewSliver.py
sfa/trust/certificate.py
sfa/trust/credential.py
sfa/util/namespace.py