Browse files

fixing issue with last commit merge. missed a conflict

  • Loading branch information...
1 parent 5e4d893 commit 9e783c0a8e276e89d9d81951a4c32ea61dadccf1 @robbyrussell robbyrussell committed Jul 23, 2011
Showing with 0 additions and 4 deletions.
  1. +0 −4 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

0 comments on commit 9e783c0

Please sign in to comment.