From 3cf4b2c7c1729635170dd92f83461c9662d126e4 Mon Sep 17 00:00:00 2001 From: Jim Alateras Date: Fri, 20 Sep 2013 10:00:30 +1000 Subject: [PATCH] Updated the section about extracting the binary --- docs/sources/contributing/devenvironment.rst | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docs/sources/contributing/devenvironment.rst b/docs/sources/contributing/devenvironment.rst index ca3f87ea5..8d95b7ca1 100644 --- a/docs/sources/contributing/devenvironment.rst +++ b/docs/sources/contributing/devenvironment.rst @@ -37,16 +37,9 @@ To checkout a different revision just use ``git checkout`` with the name of bran Step 3: Build the Environment ----------------------------- -<<<<<<< HEAD This following command will build a development environment using the Dockerfile in the current directory. Essentially, it will install all the build and runtime dependencies necessary to build and test Docker. This command will take some time to complete when you first execute it. -======= - -This following command will build a development environment using the Dockerfile in the current directory. Essentially, it will install all the build and runtime dependencies necessary to build and test Docker. This command will take some time to complete when you first execute it. - ->>>>>>> 70b731735c810d9e179837eb8761a44fbe98f391 - .. code-block:: bash sudo docker build -t docker .