Merge branch 'master' of github.com:erynofwales/dotfiles
Conflicts: zshrc
This commit is contained in:
commit
637fb20384
11 changed files with 343 additions and 267 deletions
|
|
@ -1 +1 @@
|
|||
Subproject commit c6b09594a9c78df92245d60faf37a43fbb4853e8
|
||||
Subproject commit f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b
|
||||
Loading…
Add table
Add a link
Reference in a new issue