From faf30c84314f17f7cde64e413d38d279d519296b Mon Sep 17 00:00:00 2001
From: LinlyBoi <libkyy@e.email>
Date: Fri, 10 Feb 2023 23:00:17 +0200
Subject: [PATCH] i hate this

---
 dot_zshrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dot_zshrc b/dot_zshrc
index 89b8283..31466b0 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -136,7 +136,6 @@ then
     cat NEXT_TO_RUN
 fi
 export PATH=$PATH:/sbin/
-<<<<<<< Updated upstream
 export PATH=$PATH:$HOME/.spicetify:/home/libkyy/.cargo/bin:/usr/local/texlive/2022/bin/x86_64-linux
 export PATH=$PATH:$HOME/.local/share/flutter/bin
 export ANDROID_HOME=$HOME/Android/Sdk