From 2fa513acc7eaf72a158e26bc46f5ff4dec4a2b86 Mon Sep 17 00:00:00 2001
From: yuzu-eva <cafebabe@disroot.org>
Date: Fri, 20 Dec 2024 12:39:17 +0100
Subject: fix

---
 .config/shell/aliasrc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index abe48ce..459a714 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -19,12 +19,7 @@ alias tmn='tmux new-session -A -s'
 alias wgu='sudo wg-quick up /etc/wireguard/wg0.conf'
 alias wgd='sudo wg-quick down /etc/wireguard/wg0.conf'
 alias zzz='sudo zzz'
-<<<<<<< HEAD
-
-alias mvsave='rm Mizuki.ds2party.bak && mv Mizuki.ds2party Mizuki.ds2party.bak && mv Mizuki.ds2party.tmp Mizuki.ds2party'
-=======
 alias ska="ps -u $USER | awk 'NR > 1 { print $1 }' | xargs -t kill"
->>>>>>> b1d6a43 (updated and removed some aliases)
 
 # compiler
 alias clang='clang -march=native -O3 -flto=thin'
-- 
cgit v1.2.3