Conflict merge 1

This commit is contained in:
Preston Davis 2015-10-31 06:26:30 -04:00
commit 4d4fd1ba97
19 changed files with 1371 additions and 0 deletions

View file

@ -1,8 +1,15 @@
read -r -p "Are you sure you want to remove Oh My Zsh? [y/N] " confirmation
<<<<<<< HEAD
if [ "$confirmation" != y ] && [ "$confirmation" != Y ]
then
echo "Uninstall cancelled"
exit
=======
if ! [[ $confirmation =~ ^[yY]$ ]]
then
echo "Uninstall cancelled"
exit
>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
fi
echo "Removing ~/.oh-my-zsh"