From 18296c3d8e5b4c570dfd70bb3279aafc4c1cfeef Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Tue, 26 Oct 2021 19:42:43 -0700
Subject: [PATCH] meta: consolidate AUTHORS entries for alexzherdev
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.mailmap b/.mailmap
index bd7ce4197cb2dc..67b3aa21823a43 100644
--- a/.mailmap
+++ b/.mailmap
@@ -12,6 +12,7 @@ Alex Hultman <alexhultman@gmail.com> <alexhultman@localhost.localdomain>
 Alex Jordan <alex@strugee.net>
 Alex Kocharin <rlidwka@kocharin.ru>
 Alex Kocharin <rlidwka@kocharin.ru> <alex@kocharin.ru>
+Alex Zherdev <alex.zherdev@gmail.com> <alex_zherdev@acl.com>
 Alexander Marchenko <axvmindaweb@gmail.com>
 Alexey Kupershtokh <alexey.kupershtokh@gmail.com> <wicked@alawar.com>
 Alexis Campailla <alexis@janeasystems.com> <orangemocha@github.com>
diff --git a/AUTHORS b/AUTHORS
index e436826aa18c79..75980374258f63 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2833,7 +2833,7 @@ akitsu-sanae <akitsu.sanae@gmail.com>
 Minuk Park <parkm86@gmail.com>
 Jim Schlight <jim@inspiredware.com>
 Theotime Poisseau <theotime.poisseau@gmail.com>
-Alex Zherdev <alex_zherdev@acl.com>
+Alex Zherdev <alex.zherdev@gmail.com>
 dev-313 <shekhawat.dev313@gmail.com>
 Michael Perrotte <mike@npmjs.com>
 Alexandre Ferrando <alferpal@gmail.com>
@@ -2914,7 +2914,6 @@ jens-cappelle <jens.jan.cappelle@gmail.com>
 bruce-one <bryce@gibson-consulting.com.au>
 Jason Macgowan <jason.macgowan@icloud.com>
 Vincent Dhennin <vincent.dhennin@viacesi.fr>
-Alex Zherdev <alex.zherdev@gmail.com>
 Jeny <yenymzo@gmail.com>
 Tchoupinax <corentinfiloche@hotmail.fr>
 Sebastien Ahkrin <sebastien48criquet@gmail.com>