[conflict] Resolve merge conflict
This commit is contained in:
@ -7,7 +7,7 @@ export ZSH="$HOME/.oh-my-zsh"
|
||||
|
||||
ZSH_THEME="robbyrussell"
|
||||
|
||||
plugins=(git z fzf asdf direnv emacs yarn)
|
||||
plugins=(git z fzf asdf direnv yarn)
|
||||
|
||||
eval "$(aws configure export-credentials --profile np-farmers --format env)"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user