mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-04-17 04:29:14 +02:00
Merge remote-tracking branch 'cadusk/master'
Conflicts: README.textile lib/aliases.zsh templates/zshrc-linux.zsh templates/zshrc-mac.zsh templates/zshrc.zsh-template
This commit is contained in:
commit
4ab34ba94c
3 changed files with 17 additions and 7 deletions
|
|
@ -50,7 +50,6 @@ plugins=(git)
|
|||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
zstyle ':completion:*:descriptions' format '%B%d%b'
|
||||
|
||||
# User configuration
|
||||
|
||||
export PATH=$HOME/bin:/usr/local/bin:$PATH
|
||||
|
|
@ -73,4 +72,4 @@ if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
|
|||
# export SSH_KEY_PATH="~/.ssh/dsa_id"
|
||||
|
||||
if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
|
||||
unsetopt correctall
|
||||
unsetopt correctall
|
||||
Loading…
Add table
Add a link
Reference in a new issue