Merge remote-tracking branch 'chhschou/master' into staging_065
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.
This commit is contained in:
commit
e763fa14b0
3 changed files with 6 additions and 5 deletions
|
@ -96,7 +96,7 @@ case $POWERLEVEL9K_MODE in
|
|||
VCS_GIT_GITLAB_ICON $'\uE20E ' #
|
||||
VCS_HG_ICON $'\uE1C3 ' #
|
||||
VCS_SVN_ICON '(svn) '
|
||||
RUST_ICON ''
|
||||
RUST_ICON '(rust)'
|
||||
PYTHON_ICON $'\ue63c' #
|
||||
SWIFT_ICON ''
|
||||
GO_ICON ''
|
||||
|
@ -478,7 +478,7 @@ case $POWERLEVEL9K_MODE in
|
|||
VCS_GIT_GITLAB_ICON ''
|
||||
VCS_HG_ICON ''
|
||||
VCS_SVN_ICON ''
|
||||
RUST_ICON ''
|
||||
RUST_ICON 'Rust'
|
||||
PYTHON_ICON ''
|
||||
SWIFT_ICON 'Swift'
|
||||
GO_ICON 'Go'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue