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

Fix merge errors

Browse source
This commit is contained in:
Jeffrey Horn 2012-01-25 21:32:45 -05:00
commit 18e8997c39
2 changed files with 1 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
oh-my-zsh.sh
View file

@ -51,13 +51,11 @@ for plugin ($plugins); do
done
# Load all of your custom configurations from custom/
<<<<<<< HEAD
for config_file ($ZSH_CUSTOM/*.zsh) source $config_file
=======
if [ -d "$ZSH/custom" ]; then
for config_file ($ZSH/custom/*.zsh) source $config_file
fi
>>>>>>> bd003653824bcff2231d20df783f239aff64b4b4
# Load the theme
if [ "$ZSH_THEME" = "random" ]