diff options
| author | Fredrik Appelberg <fredrik.appelberg@gmail.com> | 2011-12-08 10:02:17 +0100 |
|---|---|---|
| committer | Fredrik Appelberg <fredrik.appelberg@gmail.com> | 2011-12-08 10:02:17 +0100 |
| commit | e24230cbfb766320fa13fcda6c1adb60028288f4 (patch) | |
| tree | 1137da0d087f136626bbc692b4a4dabf48598f68 /.gitignore | |
| parent | 7c36ef7faa65441f8eec27589f24ba9f18f8d66c (diff) | |
| parent | 0a896119214b5211d26be6446d5e98af7634c5ae (diff) | |
| download | zsh-e24230cbfb766320fa13fcda6c1adb60028288f4.tar.gz zsh-e24230cbfb766320fa13fcda6c1adb60028288f4.tar.bz2 zsh-e24230cbfb766320fa13fcda6c1adb60028288f4.zip | |
Merge branch 'master' of git@github.com:fred-o/oh-my-zsh
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 2e8db7341..51a5ee6c3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,6 @@ projects.zsh custom/* !custom/example !custom/example.zsh -cache *.swp +!custom/example.zshcache +cache/ |