resolve conflict manually

[sfa.git] / sfa / methods / RenewSliver.py

diff --git a/sfa/methods/RenewSliver.py b/sfa/methods/RenewSliver.py
index ab2063f..1d7c540 100644 (file)
--- a/sfa/methods/RenewSliver.py
+++ b/sfa/methods/RenewSliver.py
@@ -1,5 +1,5 @@
 from sfa.util.faults import *
-from sfa.util.namespace import *
+from sfa.util.namespace import urn_to_hrn
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter
 from sfa.trust.credential import Credential