remove failed merge tag from pin ls help

License: MIT Signed-off-by: Jeromy <[email protected]>
rht · Jan 12, 2016 · 3c6a40a · 3c6a40a
1 parent 04914ac
commit 3c6a40a
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/core/commands/pin.go b/core/commands/pin.go
@@ -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.
 `,
 		LongDescription: `
-<<<<<<< HEAD
 Returns a list of objects that are pinned locally.
 By default, only recursively pinned returned, but others may be shown via the '--type' flag.