remove failed merge tag from pin ls help

whyrusleeping · whyrusleeping · commit 3c6a40a3a7e3 · 2016-01-12T12:32:21.000-08:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
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.
 
