linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-03-13 03:12:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://github.com/netzverweigerer/oh-my-zsh

Browse source 
Conflicts:
	lib/powerlinecolours
	themes/powerline.zsh-theme
	zshrc
This commit is contained in:
Armin 2015-01-31 00:54:07 +01:00
commit 43e1610e82
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
themes/powerline.zsh-theme
View file

@ -204,4 +204,7 @@ PROMPT='%{%f%b%k%}$(build_prompt) '
RPROMPT='%{%f%r%k%}$(build_rprompt) '
<<<<<<< HEAD
=======
>>>>>>> 0166395a0ca78d2d253a3f38272d6542bdf2efda