fd6861b8cd3ff12162d89babf27945a50d739ca8

 1diff --git a/lib/aliases.zsh b/lib/aliases.zsh
 2index c4428d405d8c0f906b5ea12f1e9de290bc2e5076..9286773473ef8e663a3201bc0f631df5c81f87b5 100644
 3--- a/lib/aliases.zsh
 4+++ b/lib/aliases.zsh
 5@@ -10,6 +10,8 @@ alias sd='ruby script/destroy'
 6 alias sp='ruby script/plugin'
 7 alias ssp='ruby script/spec'
 8 alias rdbm='rake db:migrate'
 9+alias sc='ruby script/console'
10+alias sd='ruby script/server --debugger'
11 
12 # Basic directory operations
13 alias .='pwd'
14@@ -62,15 +64,6 @@ alias et='mate . &'
15 alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'
16 alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
17 alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
18-<<<<<<< HEAD:lib/aliases.zsh
19-=======
20-
21-## Ruby related
22-# Ruby scripts
23-alias sc='ruby script/console'
24-alias sd='ruby script/server --debugger'
25 
26 # Editor Ruby file in TextMate
27-alias mr='mate CHANGELOG app config db lib public script spec test'
28-
29->>>>>>> 886d97f41e72b8662232a2c6b196fb60508e4f67:lib/aliases.zsh
30+alias mr='mate CHANGELOG app config db lib public script spec test'