merge conflict handled

This commit is contained in:
2026-06-13 09:29:37 +02:00
parent 406baf2a5d
commit e4eb23f10f
+1 -1
View File
@@ -69,7 +69,7 @@
librewolf
mullvad
neovim
nixGitCherryPicker-laptop
nix-git-cherry-picker-laptop
notewrapper
oh-my-zsh
ripgrep