diff options
| author | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-22 21:24:52 -0400 |
|---|---|---|
| committer | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-22 21:24:52 -0400 |
| commit | d70e73294494e68c94879c7bf22f708a3049a9d4 (patch) | |
| tree | 696f9a6cb49cab00924942eb5147b99b5fb1798d /.gitignore | |
| parent | 5a586670d73dbbda97d124e33398aabf21597659 (diff) | |
| parent | 178b5224e830845e45070ef803fcdb5a3f468dca (diff) | |
| download | zsh-d70e73294494e68c94879c7bf22f708a3049a9d4.tar.gz zsh-d70e73294494e68c94879c7bf22f708a3049a9d4.tar.bz2 zsh-d70e73294494e68c94879c7bf22f708a3049a9d4.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 51a5ee6c3..8fa66f02f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ locals.zsh log/.zsh_history projects.zsh -custom/* -!custom/example +custom +!custom/plugins/example !custom/example.zsh *.swp !custom/example.zshcache |