[32/50] brooklyn-docs git commit: Correcting bad cherry pick merge.

[he...@apache.org]

Correcting bad cherry pick merge.


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/1ab5b5e4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/1ab5b5e4
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/1ab5b5e4

Branch: refs/heads/0.5.0
Commit: 1ab5b5e4a7e66088a2e32ea56483d3d2c95137f2
Parents: 8ac1415
Author: David Toy <d...@vidtoy.co.uk>
Authored: Fri Apr 19 14:24:54 2013 +0100
Committer: David Toy <d...@vidtoy.co.uk>
Committed: Mon Apr 22 12:52:48 2013 +0100

----------------------------------------------------------------------
 docs/use/guide/quickstart/index.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/1ab5b5e4/docs/use/guide/quickstart/index.md
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/index.md b/docs/use/guide/quickstart/index.md
index d8a40fd..9c5f1b0 100644
--- a/docs/use/guide/quickstart/index.md
+++ b/docs/use/guide/quickstart/index.md
@@ -11,15 +11,10 @@ This guide will get you up and running with Brooklyn quickly. You will become fa
 You are going to need some basic tools (that are normally installed by default). You will need `curl`, `wget`, `tar`, `ssh` and `ssh-keygen`.
 
 ### Download Brooklyn
-Download the Brooklyn distribution. This contains Brooklyn, ready to run.
 
-<<<<<<< HEAD
-[Download Page]({{site.url}}/start/download.html#distro) (Get the Distro as a tgz.)
+Download the Brooklyn distribution. This contains Brooklyn, ready to run.
 
-Save the Distro tgz file to your home directory `~/`, or a location of your choice. 
-=======
 Save the [Distro tgz]({{ this_dist_url_tgz }}) file to your home directory `~/`, or a location of your choice. (Other [download options]({{site.url}}/start/download.html) are available.)
->>>>>>> 7f47f59... SSH Keys: Mention no password.
 
 Untar the tgz. Each Distro is timestamped, so your filename will be different.