Conflicts were: - powerlevel9k.zsh-theme and test/segments/rust_version.spec: rust_version Segment changed (#641) on master and colors got names (#703) on next. |
||
|---|---|---|
| .. | ||
| functions | ||
| segments | ||
| powerlevel9k.spec | ||
Conflicts were: - powerlevel9k.zsh-theme and test/segments/rust_version.spec: rust_version Segment changed (#641) on master and colors got names (#703) on next. |
||
|---|---|---|
| .. | ||
| functions | ||
| segments | ||
| powerlevel9k.spec | ||