From ef7756d6873e5cf91e33d8c7f5dd0ecf7f06f074 Mon Sep 17 00:00:00 2001
From: Thies Lennart Alff <lennart.alff@gmail.com>
Date: Fri, 21 Oct 2022 21:45:22 +0200
Subject: [PATCH] removed errenous line

---
 .zshrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.zshrc b/.zshrc
index 64b9eac..fe752aa 100644
--- a/.zshrc
+++ b/.zshrc
@@ -89,6 +89,5 @@ fi
 
 alias reboot-windows="systemctl reboot --boot-loader-entry=windows.conf"
 alias reboot-linux="systemctl reboot --boot-loader-entry=arch.conf"
-<<<<<<< Updated upstream
 alias zshrc="vim ~/.zshrc"