From 52f5eb20058796f3f4673b07c0f2c0463ed817b8 Mon Sep 17 00:00:00 2001 From: Robby Russell Date: Mon, 26 Oct 2009 09:09:00 -0700 Subject: [PATCH] Merging conflict. 788c9af05684f4b9e39e7f15de2c06c4c8291cbd --- lib/aliases.zsh | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/aliases.zsh b/lib/aliases.zsh index 304bafd2..69f2eee1 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 &' - - -