[conflict] Resolve merge conflict

This commit is contained in:
2024-10-31 11:00:10 -04:00
parent 2c92cb5342
commit 66e76c2764
4 changed files with 52 additions and 2 deletions

View File

@ -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)"