diff options
author | Ben Hilburn <ben.hilburn@ettus.com> | 2015-09-16 01:39:00 +0300 |
---|---|---|
committer | Ben Hilburn <ben.hilburn@ettus.com> | 2015-09-16 01:39:00 +0300 |
commit | 6b45e84b2e639d8eb0b4589ae905d52fa504769e (patch) | |
tree | 4369ae664a071f045743bfd437653aae90356495 /powerlevel9k.zsh-theme | |
parent | f26dcf3a87e259a94ea37e2d9c6fbc6dc7dfe64f (diff) | |
parent | 2a2dfdfa295190892deb74207173e5b00af6561c (diff) |
Merge branch 'master' into next
Fixed conflict caused by PR #91.
Diffstat (limited to 'powerlevel9k.zsh-theme')
-rw-r--r-- | powerlevel9k.zsh-theme | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 5a269f90..ac751c1d 100644 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -152,9 +152,9 @@ case $POWERLEVEL9K_MODE in LOAD_ICON $'\UE190 ' # #RAM_ICON $'\UE87D' # RAM_ICON $'\UE1E2 ' # - VCS_UNTRACKED_ICON $'\UE16C' # - VCS_UNSTAGED_ICON $'\UE17C' # - VCS_STAGED_ICON $'\UE168' # + VCS_UNTRACKED_ICON $'\uF059' # + VCS_UNSTAGED_ICON $'\uF06A' # + VCS_STAGED_ICON $'\uF055' # VCS_STASH_ICON $'\UE133 ' # #VCS_INCOMING_CHANGES_ICON $'\UE1EB ' # #VCS_INCOMING_CHANGES_ICON $'\UE80D ' # @@ -165,9 +165,9 @@ case $POWERLEVEL9K_MODE in VCS_TAG_ICON $'\UE817 ' # VCS_BOOKMARK_ICON $'\UE87B' # VCS_COMMIT_ICON $'\UE821 ' # - VCS_BRANCH_ICON $'\UE220' # + VCS_BRANCH_ICON $'\uF126 ' # VCS_REMOTE_BRANCH_ICON ' '$'\UE804 ' # - VCS_GIT_ICON $'\UE20E ' # + VCS_GIT_ICON $'\uF113 ' # VCS_HG_ICON $'\UE1C3 ' # ) ;; |