fixing issue with last commit merge. missed a conflict

9e783c0a · Robby Russell · 5e4d8938 · 9e783c0a
Commit 9e783c0a authored Jul 23, 2011 by Robby Russell
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

git.plugin.zsh plugins/git/git.plugin.zsh +0 -4

No files found.
--- 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