summary refs log tree commit diff stats
path: root/git
diff options
context:
space:
mode:
authorAlan Pearce2019-02-06 15:59:25 +0000
committerAlan Pearce2019-02-06 15:59:25 +0000
commit99346e22d6345014844126f4b304ee4ddf02c8d8 (patch)
treed09cf673cff075310def9dea1aedd438eba70c5b /git
parentd003572ef2a5e1247b1b7da60062eb6b95721a18 (diff)
downloadnixfiles-99346e22d6345014844126f4b304ee4ddf02c8d8.tar.lz
nixfiles-99346e22d6345014844126f4b304ee4ddf02c8d8.tar.zst
nixfiles-99346e22d6345014844126f4b304ee4ddf02c8d8.zip
Git: remove bulkworkspaces setup
Diffstat (limited to 'git')
-rw-r--r--git/.config/git/config4
1 files changed, 1 insertions, 3 deletions
diff --git a/git/.config/git/config b/git/.config/git/config
index 8280589a..3ff37eed 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -52,6 +52,4 @@
 
 [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
\ No newline at end of file
+	driver = npx npm-merge-driver merge %A %O %B %P
\ No newline at end of file