aboutsummaryrefslogtreecommitdiff
path: root/.bashrc
diff options
context:
space:
mode:
Diffstat (limited to '.bashrc')
-rw-r--r--.bashrc3
1 files changed, 0 insertions, 3 deletions
diff --git a/.bashrc b/.bashrc
index a01156c..eca502d 100644
--- a/.bashrc
+++ b/.bashrc
@@ -79,12 +79,9 @@ export SSH_ASKPASS=~/.local/bin/ssh-askpass
export TERMINAL="foot"
export SAL_USE_VCLPLUGIN=gtk3
-<<<<<<< HEAD
# Path to Zig binary
export PATH=$PATH:~/Downloads/zig/zig-linux-x86_64-0.11.0/
-=======
->>>>>>> parent of 632d6d0 (Added zig 0.11.0 binary location to PATH variable)
# Enable the use of ssh-agent
if ! pgrep -u "$USER" ssh-agent > /dev/null; then
ssh-agent -t 1h > "$XDG_RUNTIME_DIR/ssh-agent.env"