summary refs log tree commit diff stats
path: root/git
diff options
context:
space:
mode:
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