From 3c6a40a3a7e360026bd012b836d6dd1db38a4594 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Tue, 12 Jan 2016 12:32:21 -0800
Subject: [PATCH] remove failed merge tag from pin ls help

License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
---
 core/commands/pin.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/commands/pin.go b/core/commands/pin.go
index 89c3cf14b..e6155df9c 100644
--- 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.
 
-- 
GitLab