diff options
| author | Robby Russell <robby@planetargon.com> | 2009-10-26 09:09:00 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2009-10-26 09:09:00 -0700 |
| commit | 52f5eb20058796f3f4673b07c0f2c0463ed817b8 (patch) | |
| tree | baf82597fe33261c562480ab095fe38f2d307209 /lib | |
| parent | 56693663adbf9d8c5809612bd23324e90ceb4cd6 (diff) | |
| download | zsh-52f5eb20058796f3f4673b07c0f2c0463ed817b8.tar.gz zsh-52f5eb20058796f3f4673b07c0f2c0463ed817b8.tar.bz2 zsh-52f5eb20058796f3f4673b07c0f2c0463ed817b8.zip | |
Merging conflict. 788c9af05684f4b9e39e7f15de2c06c4c8291cbd
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aliases.zsh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/aliases.zsh b/lib/aliases.zsh index 304bafd27..69f2eee15 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -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 &' - - - |