Resolving conflict when merging in #528

2013-04-23 20:58:30 -07:00 · 2013-04-23 20:58:30 -07:00 · 8ce587ad9a
parent c3c355a88a 0061dda057
commit 8ce587ad9a
1 changed files with 1 additions and 0 deletions
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@ -2,6 +2,7 @@ alias be="bundle exec"
 alias bi="bundle install"
 alias bl="bundle list"
 alias bp="bundle package"
+alias bo="bundle open"
 alias bu="bundle update"

 # The following is based on https://github.com/gma/bundler-exec