From e4eb23f10f38a09b1dba615869c5f3a2b65416a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= <tomas.riveral@icloud.com>
Date: Sat, 13 Jun 2026 09:21:11 +0200
Subject: [PATCH] merge conflict handled

---
 modules/hosts/laptop.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hosts/laptop.nix b/modules/hosts/laptop.nix
index 0ff6de1..13553ba 100644
--- a/modules/hosts/laptop.nix
+++ b/modules/hosts/laptop.nix
@@ -69,7 +69,7 @@
       librewolf
       mullvad
       neovim
-      nixGitCherryPicker-laptop
+      nix-git-cherry-picker-laptop
       notewrapper
       oh-my-zsh
       ripgrep