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 librewolf
mullvad mullvad
neovim neovim
nixGitCherryPicker-laptop nix-git-cherry-picker-laptop
notewrapper notewrapper
oh-my-zsh oh-my-zsh
ripgrep ripgrep