From 1e165b72ef9a39c1603223659b5899da72f272c6 Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Mon, 11 Oct 2010 11:43:44 -0700
Subject: [PATCH] another git-related artifact

---
 plugins/git/git.plugin.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index a7e586236..04f221de4 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -13,7 +13,6 @@ alias gb='git branch'
 alias gba='git branch -a'
 alias gcount='git shortlog -sn'
 alias gcp='git cherry-pick'
-<<<<<<< HEAD
 alias gsub='git submodule'
 
 =======