solve conflicts

[sfa.git] / sfa / server / sfaapi.py

diff --git a/sfa/server/sfaapi.py b/sfa/server/sfaapi.py
index 87f7935..1c46257 100644 (file)
--- a/sfa/server/sfaapi.py
+++ b/sfa/server/sfaapi.py
@@ -4,15 +4,15 @@ import datetime
 from sfa.util.faults import SfaAPIError
 from sfa.util.config import Config
 from sfa.util.cache import Cache
-
 from sfa.trust.auth import Auth
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.credential import Credential
 
-# this is wrong all right, but temporary 
+# this is wrong all right, but temporary, will use generic
 from sfa.managers.managerwrapper import ManagerWrapper, import_manager
-
 from sfa.server.xmlrpcapi import XmlrpcApi
+import os
+import datetime
 
 ####################
 class SfaApi (XmlrpcApi):