linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-04-03 04:20:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Conflict merge 1

Browse source
This commit is contained in:
Preston Davis 2015-10-31 06:26:30 -04:00
commit 4d4fd1ba97
19 changed files with 1371 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/rails/rails.plugin.zsh
View file

@ -42,7 +42,10 @@ alias rp='rails plugin'
alias ru='rails runner'
alias rs='rails server'
alias rsd='rails server --debugger'
<<<<<<< HEAD
alias rsp='rails server --port'
=======
>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
# Rake aliases
alias rdm='rake db:migrate'