Conflicts were: - test/segments/command_execution_time.spec and test/segments/go_version.spec: All conflicts come from renaming color names on next (#703) and adding a whitespace to the Visual Identifier (#854) on master. |
||
|---|---|---|
| .. | ||
| functions | ||
| segments | ||
| powerlevel9k.spec | ||