all repos — archive/dotfiles @ 99346e22d6345014844126f4b304ee4ddf02c8d8

Superseded by nixfiles

Git: remove bulkworkspaces setup
Alan Pearce alan@alanpearce.eu
Wed, 06 Feb 2019 15:59:25 +0000
commit

99346e22d6345014844126f4b304ee4ddf02c8d8

parent

d003572ef2a5e1247b1b7da60062eb6b95721a18

1 files changed, 1 insertions(+), 3 deletions(-)

jump to
M git/.config/git/configgit/.config/git/config
@@ -52,6 +52,4 @@ program = gpg 
 [merge "npm-merge-driver"]
 	name = automatically merge npm lockfiles
-	driver = npx npm-merge-driver merge %A %O %B %P
-[bulkworkspaces]
-	satoshipay = /home/alan/projects/github.com/satoshipay+	driver = npx npm-merge-driver merge %A %O %B %P