mirror of
https://github.com/robbyrussell/oh-my-zsh.git
synced 2026-07-01 02:27:22 +02:00
Merge branch 'master' of git@github.com:fred-o/oh-my-zsh
Conflicts: .gitignore
This commit is contained in:
+2
-1
@@ -4,5 +4,6 @@ projects.zsh
|
||||
custom/*
|
||||
!custom/example
|
||||
!custom/example.zsh
|
||||
cache
|
||||
*.swp
|
||||
!custom/example.zshcache
|
||||
cache/
|
||||
|
||||
Reference in New Issue
Block a user