From e2983872bb739f1b4d3d0cf04994adf0d93844fd Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Fri, 5 Jun 2015 11:16:22 +0200
Subject: [PATCH] Typo

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 gitlab-mode.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gitlab-mode.el b/gitlab-mode.el
index 474c3ed..9b96054 100644
--- a/gitlab-mode.el
+++ b/gitlab-mode.el
@@ -142,7 +142,6 @@ If optional arg BUTTON is non-nil, describe its associated project."
       (user-error "No project here"))))
 
 
->>>>>>> develop
 (defun gitlab-show-projects ()
   "Show Gitlab projects."
   (interactive)