diff options
| author | Dominik Ritter <dritter03@googlemail.com> | 2018-06-07 01:11:15 +0300 |
|---|---|---|
| committer | Dominik Ritter <dritter03@googlemail.com> | 2018-06-07 01:11:15 +0300 |
| commit | 4c2f58bdbdaee400b076f2dd56aa5fea2bf9e309 (patch) | |
| tree | 58563969b91e31abe24f44a1403c2ced50e0419f /functions/colors.zsh | |
| parent | 154e9230339e85009407b01e4aff076a3d76efa9 (diff) | |
| parent | b260adbc1bc68d9729d6eebcfd344f83655bfda9 (diff) | |
Merge remote-tracking branch 'VanRoy/master' into staging_065
Conflicts were:
- functions/icons.zsh: The Java Segment was added on master, but on next
were added various Segments with icons in the meantime.
- powerlevel9k.zsh-theme: Java Segment was added on master, Dropbox
Segment was added on next.
Diffstat (limited to 'functions/colors.zsh')
0 files changed, 0 insertions, 0 deletions