浏览代码

Removing HEAD tag from last commit

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
Scott Collier 11 年之前
父节点
当前提交
fbf74eb079
共有 1 个文件被更改,包括 0 次插入2 次删除
  1. 0 2
      docs/sources/reference/commandline/cli.rst

+ 0 - 2
docs/sources/reference/commandline/cli.rst

@@ -969,9 +969,7 @@ The last container is marked as a ``Ghost`` container. It is a container that wa
 
 
     Pull an image or a repository from the registry
     Pull an image or a repository from the registry
 
 
-<<<<<<< HEAD
       -t, --tag="": Download tagged image in repository
       -t, --tag="": Download tagged image in repository
->>>>>>> b47d9c5... Adding CLI options to the commandline reference documentation.
 
 
 
 
 .. _cli_push:
 .. _cli_push: