From b5811792e754e5e0175aa2ee5808411b0ac04e61 Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Mon, 11 Oct 2010 11:35:16 -0700
Subject: [PATCH] remove git-added info

---
 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 eb8d522a6..a7e586236 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -18,7 +18,6 @@ alias gsub='git submodule'
 
 =======
 alias glg='git log --stat --max-count=5'
->>>>>>> upstream/master
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'