Browse code

Removing HEAD tag from last commit

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

Scott Collier authored on 2014/03/12 10:00:16
Showing 1 changed files
... ...
@@ -969,9 +969,7 @@ The last container is marked as a ``Ghost`` container. It is a container that wa
969 969
 
970 970
     Pull an image or a repository from the registry
971 971
 
972
-<<<<<<< HEAD
973 972
       -t, --tag="": Download tagged image in repository
974
->>>>>>> b47d9c5... Adding CLI options to the commandline reference documentation.
975 973
 
976 974
 
977 975
 .. _cli_push: