chore(global): just casual merge conflict fix btw

Signed-off-by: Andrei Jiroh Halili <ajhalili2006@andreijiroh.xyz>
This commit is contained in:
Andrei Jiroh Halili 2024-10-10 18:19:49 +08:00
parent 5c84218091
commit 669efc81cd
No known key found for this signature in database
GPG key ID: 67BFC91B3DA12BE8
12 changed files with 108 additions and 31 deletions

View file

@ -72,8 +72,8 @@ export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quo
# You may want to put all your additions into a separate file like
# ~/.bash_aliases, instead of adding them here directly.
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
source "${HOME}/.config/bash/aliases"
source "${HOME}/.config/bash/functions"
source "${HOME}/.config/bash/aliases.bashrc"
source "${HOME}/.config/bash/functions.bashrc"
source "${HOME}/.config/bash/autoloader.bashrc"
# enable programmable completion features (you don't need to enable
@ -88,4 +88,4 @@ if ! shopt -oq posix; then
fi
[ -f "${HOME}/.config/bash/hosts/${HOSTNAME_BASH}.bashrc" ] \
&& . "${HOME}/.config/bash/hosts/${HOSTNAME_BASH}.bashrc"
&& . "${HOME}/.config/bash/hosts/${HOSTNAME_BASH}.bashrc"