Merge branch 'master' of ssh://git.planet-lab.org/git/sfa

diff --git a/sfa/methods/Resolve.py b/sfa/methods/Resolve.py
index 659f9de..36fa40d 100644 (file)
--- a/sfa/methods/Resolve.py
+++ b/sfa/methods/Resolve.py
@@ -35,6 +35,7 @@ class Resolve(Method):
         hrns = [urn_to_hrn(xrn)[0] for xrn in xrns]
         #test
         #test2
+        #test tmack  
         #find valid credentials
         valid_creds = self.api.auth.checkCredentials(creds, 'resolve')