Skip to content

GitLab

Commit 52f5eb20 authored by Robby Russell's avatar Robby Russell
Browse files

Merging conflict. 788c9af0

parent 56693663
Show whitespace changes
Inline Side-by-side
lib/aliases.zsh
View file @ 52f5eb20
...@@ -55,6 +55,3 @@ alias et='mate . &' ...@@ -55,6 +55,3 @@ alias et='mate . &'
alias ett='mate app config lib db public spec test Rakefile Capfile Todo &' 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 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 &' alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment