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

merge

Browse source
This commit is contained in:
Locojay 2011-06-05 20:41:46 -04:00
commit d2bf5b9226
1 changed files with 0 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
oh-my-zsh.sh
View file

@ -48,21 +48,3 @@ else
source "$ZSH/themes/$ZSH_THEME.zsh-theme"
fi
<<<<<<< HEAD
# Load all of your custom configurations from custom/
for config_file ($ZSH/custom/*.zsh) source $config_file
# Compile zcompdump, if modified, to increase startup speed.
if [ "$HOME/.zcompdump" -nt "$HOME/.zcompdump.zwc" -o ! -e "$HOME/.zcompdump.zwc" ]; then
zcompile "$HOME/.zcompdump"
fi
# Check for updates on initial load...
if [ "$DISABLE_AUTO_UPDATE" = "true" ]
then
return
else
/usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
fi
=======
>>>>>>> robbyrussel/master