fix conflict

[dotfiles.git] / zsh / zshrc

diff --git a/zsh/zshrc b/zsh/zshrc
index eb6b039..b0e3857 100644 (file)
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -210,3 +210,6 @@ export ZSHHOME="$HOME/.zsh"
 #` git log --oneline --abbrev-commit --all --graph --decorate --color `
 [[ -s `brew --prefix`/etc/autojump.sh ]] && . `brew --prefix`/etc/autojump.sh
 
+alias emacs='TERM=xterm-256color emacs -nw'
+
+alias tw='open -a /Applications/TextWrangler.app/'