merge has conflicts @limorbortman you need to fix this ... 
just pull latest master an do a manual merge...

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/574#issuecomment-63495218

Reply via email to