52f5eb20058796f3f4673b07c0f2c0463ed817b8

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merging conflict. 788c9af05684f4b9e39e7f15de2c06c4c8291cbd

Diff

 1diff --git a/lib/aliases.zsh b/lib/aliases.zsh
 2index 304bafd270b28479c1f6a5398f1d73f3f14be720..69f2eee15ecd1f4f66fa5562d639c5f061f70a9c 100644
 3--- a/lib/aliases.zsh
 4+++ b/lib/aliases.zsh
 5@@ -55,6 +55,3 @@ alias et='mate . &'
 6 alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'
 7 alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
 8 alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
 9-
10-
11-