Merging conflict. 788c9af05684f4b9e39e7f15de2c06c4c8291cbd

main
Robby Russell 15 years ago
parent f183b64cec
commit 0b724396e3

@ -55,6 +55,3 @@ alias et='mate . &'
alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'
alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'

Loading…
Cancel
Save