Commit 12232387 authored Dec 07, 2018 by Dom Sekotill

Merge remote-tracking branch 'origin/master'

parents 3eff7bfa 6d00dbf3

.oh-my-zsh @ 2614b7ec

Original line number	Diff line number	Diff line
		Subproject commit e8aba1bf5912f89f408eaebd1bc74c25ba32a62c
		Subproject commit 2614b7ecdfe8b8f0cbeafffefb5925196f4011d4

.shell/zsh_custom/themes/kodo.zsh-theme

+0 −1

Original line number	Diff line number	Diff line
		@@ -50,5 +50,4 @@ function virtualenv_name {
		PROMPT='%{$PROMPTCODES%}%{$HOST_COLOUR%}%n@%m: $%{$RESET_COLOR%} '
		RPROMPT='%(?:%{$GREEN_BOLD%}$tick:%{$RED_BOLD%}$? $cross) \
		$(virtualenv_name)\
		%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)\
		%{$RESET_COLOR%}'

tmux-yank @ 30bfd780

Original line number	Diff line number	Diff line
		Subproject commit c6a73eba6bfcde51edf57e1cc5fa12c4c7bd98d9
		Subproject commit 30bfd780061f1752d1133016f217a13add4d4e86

.vim/after/ftplugin/yaml.vim

+1 −1

Original line number	Diff line number	Diff line
		" Compact indents
		setl sw=2 ts=2 sts=2
		setl sw=2 ts=2 sts=2 expandtab

vim-fugitive @ 2564c37d

Original line number	Diff line number	Diff line
		Subproject commit e48cf2dadd7dd02db710dc35d22caec72e41ac05
		Subproject commit 2564c37d0a2ade327d6381fef42d84d9fad1d057