Remove forgotten merge conflict artifacts
Remove forgotten merge conflict artifacts

mistio/libcloud,apache/libcloud,Kami/libcloud,andrewsomething/libcloud,andrewsomething/libcloud,Kami/libcloud,andrewsomething/libcloud,apache/libcloud,mistio/libcloud,apache/libcloud,Kami/libcloud,mistio/libcloud