Files
Kenneth Reitz a985c443af Merge https://github.com/robbyrussell/oh-my-zsh
Conflicts:
	.gitignore
2011-08-02 20:34:59 -04:00

13 lines
202 B
Plaintext

<<<<<<< HEAD
.oh-my-zsh/cache/Mac_applications
=======
locals.zsh
log/.zsh_history
projects.zsh
custom/*
!custom/example
!custom/example.zsh
cache
*.swp
>>>>>>> a738ca9b645c3cc53bdb01e8676202ceca449ccf