Sun, 31 Dec 2017 14:42:54 -0500
add conflict marker highlight
# .bashrc: executed for non-login shells # probably sourced by .bash_profile though if [ -f ~/.bashrc.dist ]; then source ~/.bashrc.dist fi source ~/.bashrc.lib path-prepend "$HOME/bin" if path-prepend "$HOME/.plenv/bin"; then eval "$(plenv init -)" fi if [ -f ~/.bashrc.local ]; then source ~/.bashrc.local fi source ~/.profile.common