From b5ab51e4e10f5778ffeff005fdc2f954f348d313 Mon Sep 17 00:00:00 2001 From: Thomas Hochstein Date: Sun, 10 Jun 2018 16:05:07 +0200 Subject: Please drop or squash this commit. "to handle this entirely privately" or "to handle this entirely in private", I think. --- conflict.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict.mdwn b/conflict.mdwn index ccf21ec..add4178 100644 --- a/conflict.mdwn +++ b/conflict.mdwn @@ -349,7 +349,7 @@ I nod, and look Robin right in the eyes. "Andy's right, you didn't do anything wrong. It was Sam's job to handle the situation. He handled it badly, that's not our fault. That said, and please don't take this as any kind of attack or complaint against yourself, I wish it would've -been possible to handle this in entirely privately. It might have +been possible to handle this entirely privately. It might have resulted in less confrontation." After an impressive grimace, Robin agrees. "Maybe I should've done -- cgit v1.2.1