linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-26 02:12:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

other various changes

Browse source
This commit is contained in:
Mike Hostetler 2011-03-16 15:02:36 -05:00
commit 0d09d9a10a
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
oh-my-zsh.sh
View file

@ -8,10 +8,8 @@ fpath=($ZSH/functions $fpath)
for config_file ($ZSH/lib/*.zsh) source $config_file
# Load all of your custom configurations from custom/
for config_file ($ZSH/custom/*.zsh) source $config_file
#for config_file ($ZSH/custom/*.zsh) source $config_file
<<<<<<< HEAD
=======
# Load all of the plugins that were defined in ~/.zshrc
plugin=${plugin:=()}
for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
@ -23,4 +21,3 @@ then
else
/usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
fi
>>>>>>> upstream/master