From 406baf2a5dac332cdf6300cbfded62252d8d4514 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/utilities/nixGitCherryPicker.nix | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/modules/utilities/nixGitCherryPicker.nix b/modules/utilities/nixGitCherryPicker.nix
index 8b13c75..bd649ce 100644
--- a/modules/utilities/nixGitCherryPicker.nix
+++ b/modules/utilities/nixGitCherryPicker.nix
@@ -1,5 +1,4 @@
 {inputs, ...}: {
-<<<<<<< desktop
   flake.homeModules.nix-git-cherry-picker-laptop = {pkgs, ...}: {
     home.packages = [
       inputs.nix-git-cherry-picker.packages.${pkgs.system}.default
@@ -16,25 +15,6 @@
       force = true;
     };
   };
-  flake.homeModules.nix-git-cherry-picker-desktop = {pkgs, ...}: {
-=======
-  flake.homeModules.nixGitCherryPicker-laptop = {pkgs, ...}: {
->>>>>>> main
-    home.packages = [
-      inputs.nix-git-cherry-picker.packages.${pkgs.system}.default
-    ];
-    home.file.".config/nix-git-cherry-picker/config.json" = {
-      enable = true;
-      text = ''
-        {
-          "localBranch": "laptop",
-          "remoteBranch": "desktop",
-          "nixConfigPath": "/home/tomasr/nixos/"
-        }
-      '';
-      force = true;
-    };
-  };
   flake.homeModules.nix-git-cherry-picker-desktop = {pkgs, ...}: {
     home.packages = [
       inputs.nix-git-cherry-picker.packages.${pkgs.system}.default