Resolving conflict when merging in #528

This commit is contained in:
Robby Russell 2013-04-23 20:58:30 -07:00
commit 8ce587ad9a

View File

@ -2,6 +2,7 @@ alias be="bundle exec"
alias bi="bundle install" alias bi="bundle install"
alias bl="bundle list" alias bl="bundle list"
alias bp="bundle package" alias bp="bundle package"
alias bo="bundle open"
alias bu="bundle update" alias bu="bundle update"
# The following is based on https://github.com/gma/bundler-exec # The following is based on https://github.com/gma/bundler-exec