merge error in bashrc
This commit is contained in:
parent
2a40065939
commit
3dd9b60f5f
@ -131,9 +131,9 @@ alias zf='z $(flirt)'
|
|||||||
# You may want to put all your additions into a separate file like
|
# You may want to put all your additions into a separate file like
|
||||||
# ~/.bash_aliases, instead of adding them here directly.
|
# ~/.bash_aliases, instead of adding them here directly.
|
||||||
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
|
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
|
||||||
# if [ -z "$EDITOR" ]; then
|
if [ -z "$EDITOR" ]; then
|
||||||
export EDITOR='kak'
|
export EDITOR='kak'
|
||||||
# fi
|
fi
|
||||||
|
|
||||||
if [ -f ~/.bash_aliases ]; then
|
if [ -f ~/.bash_aliases ]; then
|
||||||
. ~/.bash_aliases
|
. ~/.bash_aliases
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user