i hate this

2023-02-10 23:00:17 +02:00
parent 1c2046921e
commit faf30c8431
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@@ -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