fixing issue with last commit merge. missed a conflict

15 years ago · 9e783c0a8e
parent 5e4d89385f
commit 9e783c0a8e
1 changed files with 0 additions and 4 deletions
--- 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