From 3474d5490d97cb1ebfe4ace0de442b74647072b0 Mon Sep 17 00:00:00 2001
From: finner <somewhat@heavy.rocks>
Date: Sun, 28 Apr 2024 14:41:44 +0200
Subject: [PATCH] fixed bash alias file after merging stashed changes

---
 .bash_aliases | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.bash_aliases b/.bash_aliases
index ac1db2f..9d8a571 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -4,8 +4,5 @@ alias mountns="sudo mount -t nfs manjarodesktop:/mnt/TerraBeef/NetShare /mnt/man
 alias sshcloud="ssh -p 1919 emge@95.217.8.112"
 alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME"
 alias syncheavy="rsync -azP --no-perms --no-owner --no-group --no-times --delete /home/emge/Development/11ty-projects/heavy-rocks/_site/ emge@95.217.8.112:/var/www/heavy.rocks/"
-<<<<<<< Updated upstream
 alias s!="sudo systemctl"
-=======
 alias portcheck="sudo lsof -i -P -n | grep LISTEN"
->>>>>>> Stashed changes