From 09e8e14af5a2773ce63cd8a69d897d8a14dccf0f Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Mon, 4 Oct 2021 23:09:41 -0700
Subject: [PATCH] meta: consolidate AUTHORS entries for jemjam
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/40328
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Zijian Liu <lxxyxzj@gmail.com>
---
 .mailmap | 2 ++
 AUTHORS  | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 7fc4c2eb058..6704a8287c0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -190,6 +190,8 @@ James Hartig <fastest963@gmail.com> <james.hartig@grooveshark.com>
 James M Snell <jasnell@gmail.com>
 James Nimlos <james@nimlos.com>
 Jan Krems <jan.krems@gmail.com> <jan.krems@groupon.com>
+Jem Bezooyen <github@jem.dev> <jem@hipmedia.ca>
+Jem Bezooyen <github@jem.dev> <jem@sendwithus.com>
 Jenna Vuong <jennavuong@gmail.com> <hello@jennavuong.com>
 Jennifer Bland <ratracegrad@gmail.com> <jennifer.bland@sbdinc.com>
 JeongHoon Byun <outsideris@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index db6ce4f9929..bc4c513469e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1802,7 +1802,7 @@ Donovan Buck <donovan@donovan.bz>
 Toby Farley <tobyfarley@gmail.com>
 Suresh Srinivas <suresh.srinivas@intel.com>
 Alberto Lopez de Lara <albertolopezdelara@gmail.com>
-Jem Bezooyen <jem@sendwithus.com>
+Jem Bezooyen <github@jem.dev>
 Bob Clewell <bob@punkave.com>
 Raj Parekh <raj.parekh@aa.com>
 Tom Boutell <tom@punkave.com>
@@ -2040,7 +2040,6 @@ Benno Fünfstück <benno.fuenfstueck@gmail.com>
 Ram Goli <ramsgoli@gmail.com>
 babygoat <babygoat1124@gmail.com>
 Will Clark <willclarktech@users.noreply.github.com>
-Jem Bezooyen <jem@hipmedia.ca>
 Haejin Jo <professionalhaejin@gmail.com>
 Hakan Kimeiga <hak7alp@gmail.com>
 Tyler <tyler.z.yang@gmail.com>