From 9e783c0a8e276e89d9d81951a4c32ea61dadccf1 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sat, 23 Jul 2011 09:14:44 -0700
Subject: [PATCH] fixing issue with last commit merge. missed a conflict

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

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 3721d3343..5132b639a 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -49,10 +49,6 @@ function current_branch() {
 alias ggpull='git pull origin $(current_branch)'
 compdef ggpull=git
 alias ggpush='git push origin $(current_branch)'
-<<<<<<< HEAD
 compdef ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
 compdef ggpnp=git
-=======
-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
->>>>>>> e5e032f... adding git svn aliases