Fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/739a8204 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/739a8204 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/739a8204 Branch: refs/heads/trunk Commit: 739a8204d646c677b6cd2e4949588fee1b2d5f82 Parents: 8db131a 216a24f Author: Samuel Chong <samuelcho...@gmail.com> Authored: Thu Dec 1 09:16:58 2016 +1100 Committer: Samuel Chong <samuelcho...@gmail.com> Committed: Thu Dec 1 09:16:58 2016 +1100 ---------------------------------------------------------------------- CHANGES.rst | 4 ++++ doap_libcloud.rdf | 7 +++++++ libcloud/compute/drivers/gce.py | 32 +++++++++++++++++++------------- libcloud/test/secrets.py-dist | 2 +- 4 files changed, 31 insertions(+), 14 deletions(-) ----------------------------------------------------------------------