From 1b2725ada47fbc751c2f15b2e7c7229fd5ff1104 Mon Sep 17 00:00:00 2001 From: Robby Russell Date: Mon, 26 Oct 2009 09:24:37 -0700 Subject: [PATCH] Fixing some conflict residue that I missed in a commit/merge: --- lib/aliases.zsh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/aliases.zsh b/lib/aliases.zsh index c4428d40..92867734 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -10,6 +10,8 @@ alias sd='ruby script/destroy' alias sp='ruby script/plugin' alias ssp='ruby script/spec' alias rdbm='rake db:migrate' +alias sc='ruby script/console' +alias sd='ruby script/server --debugger' # Basic directory operations alias .='pwd' @@ -62,15 +64,6 @@ 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 &' -<<<<<<< HEAD:lib/aliases.zsh -======= - -## Ruby related -# Ruby scripts -alias sc='ruby script/console' -alias sd='ruby script/server --debugger' # Editor Ruby file in TextMate -alias mr='mate CHANGELOG app config db lib public script spec test' - ->>>>>>> 886d97f41e72b8662232a2c6b196fb60508e4f67:lib/aliases.zsh +alias mr='mate CHANGELOG app config db lib public script spec test' \ No newline at end of file