jakob/myshellconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix merging-mistake

Browse source
This commit is contained in:
Jakobus Schürz 2023-03-07 12:15:14 +01:00
parent 5e10667910
commit a967b309da
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
functions.sh
View file

@ -57,16 +57,6 @@ function _pkcs11module_hook() {
fi fi
} }
<<<<<<< HEAD
## this function updates in combination with PROMPT_COMMAND the shell-environment-variables in tmux-sessions,
# every time prompt is called. It does it only, when called from tmux (Environment TMUX is set)
||||||| parent of a74d663 (fix tmux issues)
## this function updates in combination with PROMPT_COMMAND the shell-environment-variables in tmux-sessions,
# every time prompt is called. It does it only, when called from tmux (Environment TMUX is set)
=======
>>>>>>> a74d663 (fix tmux issues)
function _tmux_hook() { function _tmux_hook() {
## this function updates in combination with PROMPT_COMMAND the shell-environment-variables in tmux-sessions, ## this function updates in combination with PROMPT_COMMAND the shell-environment-variables in tmux-sessions,