linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-03-13 03:12:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2014-12-01 11:30:35 +01:00
commit a96971e7a8
6 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
templates/zshrc.zsh-template
View file

@ -47,14 +47,14 @@ DISABLE_AUTO_UPDATE="true"
# Add wisely, as too many plugins slow down shell startup.
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
# export MANPATH="/usr/local/man:$MANPATH"
source $ZSH/oh-my-zsh.sh
# You may need to manually set your language environment
# export LANG=en_US.UTF-8