From bf6df500236728a550d5072b25509520d07ea03e Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 18 May 2021 20:12:46 +0200
Subject: git: don't auto-merge npm lockfile conflicts

`npm install` will perform this process anyway
---
 user/settings/git.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/user/settings/git.nix b/user/settings/git.nix
index 54ef3f7e..f52f198d 100644
--- a/user/settings/git.nix
+++ b/user/settings/git.nix
@@ -47,10 +47,6 @@
       "difftool.sopsdiffer" = {
         textconf = "${pkgs.sops}/bin/sops -d";
       };
-      "merge.npm-merge-driver" = {
-        name = "automatically merge npm lockfiles";
-        driver = "${pkgs.node2nixPackages."npm-merge-driver"}/bin/npm-merge-driver merge %A %O %B %P";
-      };
       remote = {
         autoSetupMerge = true;
       };
-- 
cgit 1.4.1