8ce587ad9a90bfc0081a30bb06abed36509fd692

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Resolving conflict when merging in #528

Diff

 1diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
 2index a288cffcd380a2b100210fd465a6700d76591850..519b8e63deed7f3bf78c758ecaae94582699e0c8 100644
 3--- a/plugins/bundler/bundler.plugin.zsh
 4+++ b/plugins/bundler/bundler.plugin.zsh
 5@@ -2,6 +2,7 @@ alias be="bundle exec"
 6 alias bi="bundle install"
 7 alias bl="bundle list"
 8 alias bp="bundle package"
 9+alias bo="bundle open"
10 alias bu="bundle update"
11 
12 # The following is based on https://github.com/gma/bundler-exec