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. |
||
|---|---|---|
| .. | ||
| command_execution_time.spec | ||
| dir.spec | ||
| go_version.spec | ||
| kubecontext.spec | ||
| rust_version.spec | ||
| vcs.spec | ||