removed stray merge tag
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/5aa34e10 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/5aa34e10 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/5aa34e10 Branch: refs/heads/trunk Commit: 5aa34e10d1dd01a972c8248faa2e1ea5d3618a83 Parents: 3280fc3 Author: anthony-shaw <[email protected]> Authored: Sat Jan 9 16:35:49 2016 +1100 Committer: anthony-shaw <[email protected]> Committed: Sat Jan 9 16:35:49 2016 +1100 ---------------------------------------------------------------------- docs/index.rst | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/5aa34e10/docs/index.rst ---------------------------------------------------------------------- diff --git a/docs/index.rst b/docs/index.rst index aeba4a1..d44bc36 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -16,8 +16,6 @@ Resource you can manage with Libcloud are divided in the following categories: * :doc:`Container Services </container/index>` - container virtualization like Docker and Rkt as well as container based services * :doc:`Backup as a Service </backup/index>` - services such as Amazon EBS and OpenStack Freezer ->>>>>>> trunk - .. figure:: /_static/images/supported_providers.png :align: center
