From 6388f7523ae56bd642b0038967804eadabfe214e Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 21 Jul 2018 13:38:47 +0200
Subject: git: workaround bulkworkspaces weirdness

---
 git/.config/git/config            | 2 ++
 git/.config/git/config-satoshipay | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/git/.config/git/config b/git/.config/git/config
index b839fd4..321862d 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -50,3 +50,5 @@
 [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
diff --git a/git/.config/git/config-satoshipay b/git/.config/git/config-satoshipay
index 2b2e3bc..5fedb7d 100644
--- a/git/.config/git/config-satoshipay
+++ b/git/.config/git/config-satoshipay
@@ -1,4 +1,2 @@
 [user]
-email = alan@satoshipay.io
-[bulkworkspaces]
-	satoshipay = /home/alan/projects/github.com/satoshipay
\ No newline at end of file
+email = alan@satoshipay.io
\ No newline at end of file
-- 
cgit 1.4.1