From a3c0713d9e8431bc3290087a5badb5945824230d Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 9 Oct 2021 08:18:27 -0700
Subject: [PATCH] meta: consolidate AUTHORS entry for thw0rted
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use a .mailmap entry to consolidate the two entries for thw0rted in
AUTHORS into one entry.

PR-URL: https://github.com/nodejs/node/pull/40387
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
---
 .mailmap | 1 +
 AUTHORS  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index d524f893b29..8e4bcaf384a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -186,6 +186,7 @@ Jackson Tian <shyvo1987@gmail.com> <puling.tyq@alibaba-inc.com>
 Jake Verbaten <raynos2@gmail.com>
 Jamen Marzonie <jamenmarz@gmail.com> <jamenmarz+gh@gmail.com>
 James Beavers <jamesjbeavers@gmail.com>
+James Bromwell <james.bromwell@gdit.com> <943160+thw0rted@users.noreply.github.com>
 James Hartig <fastest963@gmail.com> <james.hartig@grooveshark.com>
 James Ide <ide@jameside.com> <ide@expo.io>
 James M Snell <jasnell@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index a11a94683e4..2d420bdafd2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2280,7 +2280,6 @@ Musa Hamwala <musahamwala@icloud.com>
 James Bromwell <james.bromwell@gdit.com>
 Jeremy Apthorp <nornagon@nornagon.net>
 Eugen Cazacu <32613393+oygen87@users.noreply.github.com>
-James Bromwell <943160+thw0rted@users.noreply.github.com>
 Csaba Palfi <csaba@palfi.me>
 Ryan Petrich <rpetrich@gmail.com>
 Andreas Girgensohn <andreasg@fxpal.com>