mirror of
https://github.com/kennethreitz-archive/dotfiles.git
synced 2026-10-24 06:59:14 +00:00
13 lines
202 B
Plaintext
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
|