remove failed merge tag from pin ls help
License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
Jeromy committed
Jan 12, 2016 at 12:32 UTC
3c6a40a3a7e360026bd012b836d6dd1db38a4594
1 file changed
-1
core/commands/pin.go
-1
@@ -161,7 +161,6 @@ Returns a list of objects that are pinned locally.
161
By default, only recursively pinned returned, but others may be shown via the '--type' flag.
162
`,
163
LongDescription: `
164
-<<<<<<< HEAD
164
Returns a list of objects that are pinned locally.
165
By default, only recursively pinned returned, but others may be shown via the '--type' flag.
166