Compare commits
No commits in common. "20b8410fb2b41a5f7f0c8ca10fd631a4f5569ab9" and "574ac34e491aaaad429e0df90280e7a0b5e8c7f5" have entirely different histories.
20b8410fb2
...
574ac34e49
1 changed files with 0 additions and 7 deletions
|
@ -29,17 +29,10 @@ export TERM=xterm-color
|
||||||
# Alias definitions.
|
# Alias definitions.
|
||||||
[[ -f ~/.bash_aliases ]] && . ~/.bash_aliases
|
[[ -f ~/.bash_aliases ]] && . ~/.bash_aliases
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
# set PATH so it includes user's private bin if it exists
|
|
||||||
[[ -d "$HOME/bin" ]] && PATH+=":$HOME/bin"
|
|
||||||
[[ -d "$HOME/.local/bin" ]] && PATH+=":$HOME/.local/bin"
|
|
||||||
[[ -d "$HOME/scipts/bin" ]] && PATH+=":$HOME/scripts/bin"
|
|
||||||
=======
|
|
||||||
# set PATH so it includes certain bin folders if they exist
|
# set PATH so it includes certain bin folders if they exist
|
||||||
[[ -d ~/bin ]] && PATH+=":$HOME/bin"
|
[[ -d ~/bin ]] && PATH+=":$HOME/bin"
|
||||||
[[ -d ~/.local/bin ]] && PATH+=":$HOME/.local/bin"
|
[[ -d ~/.local/bin ]] && PATH+=":$HOME/.local/bin"
|
||||||
[[ -d /usr/local/go/bin ]] && PATH+=":/usr/local/go/bin"
|
[[ -d /usr/local/go/bin ]] && PATH+=":/usr/local/go/bin"
|
||||||
>>>>>>> 574ac34e491aaaad429e0df90280e7a0b5e8c7f5
|
|
||||||
|
|
||||||
# source misc user scripts
|
# source misc user scripts
|
||||||
if [ -d ~/git/dotfiles/source ]; then
|
if [ -d ~/git/dotfiles/source ]; then
|
||||||
|
|
Loading…
Reference in a new issue