diff options
| -rw-r--r-- | user/settings/git.nix | 4 |
1 files changed, 0 insertions, 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; }; |