Commit 3c6a40a3 authored by Jeromy's avatar Jeromy

remove failed merge tag from pin ls help

License: MIT
Signed-off-by: default avatarJeromy <jeromyj@gmail.com>
parent 04914ace
...@@ -161,7 +161,6 @@ Returns a list of objects that are pinned locally. ...@@ -161,7 +161,6 @@ Returns a list of objects that are pinned locally.
By default, only recursively pinned returned, but others may be shown via the '--type' flag. By default, only recursively pinned returned, but others may be shown via the '--type' flag.
`, `,
LongDescription: ` LongDescription: `
<<<<<<< HEAD
Returns a list of objects that are pinned locally. Returns a list of objects that are pinned locally.
By default, only recursively pinned returned, but others may be shown via the '--type' flag. By default, only recursively pinned returned, but others may be shown via the '--type' flag.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment