[fix] broken git stuff oops

This commit is contained in:
Chris Cochrun 2026-05-08 14:50:40 -05:00
parent bc0987c09a
commit 20ff907a08
6 changed files with 0 additions and 69 deletions

View file

@ -16,11 +16,7 @@
# kdePackages.ark
harper
mumble
<<<<<<< HEAD
niri
=======
#niri
>>>>>>> 4827e2d (updates?)
bluetui
# pantalaimon
ifuse
@ -40,11 +36,7 @@
kdePackages.ffmpegthumbs
kdePackages.kdegraphics-thumbnailers
kdePackages.kdesdk-thumbnailers
<<<<<<< HEAD
inputs.affinity-nix.packages.x86_64-linux.v3
=======
inputs.affinity-nix.packages.x86_64-linux.affinity-v3
>>>>>>> 4827e2d (updates?)
android-tools
# xfce.thunar
# xfce.tumbler