From cdfdc9e4e03edfe5019fc32da3fb1874cae30152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 7 Mar 2023 12:15:14 +0100 Subject: [PATCH] fix merging-mistake --- functions.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/functions.sh b/functions.sh index ae5d4d2..1140aa2 100755 --- a/functions.sh +++ b/functions.sh @@ -57,16 +57,6 @@ function _pkcs11module_hook() { 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() { ## this function updates in combination with PROMPT_COMMAND the shell-environment-variables in tmux-sessions,