From 07351edebe4c62fd0146abf9094c73c9c6b5b040 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 8 Aug 2021 06:59:01 -0700
Subject: [PATCH] meta: consolidate AUTHORS entries for Ayase-252
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/39705
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Benjamin Gruenbaum <benjamingr@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 de1d36f39157fe..3f4317e0dd02c0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -313,6 +313,7 @@ Peter Marton <email@martonpeter.com> <peter@risingstack.com>
 Peter Paugh <ppaugh@chariotsolutions.com>
 Phillip Johnsen <johphi@gmail.com> <phillip.johnsen@finn.no>
 Prateek Singh <prateeksingh1@hotmail.com> <prateek1@ucla.edu>
+Qingyu Deng <i@ayase-lab.com> <bitdqy@hotmail.com>
 Rachel White <loveless@gmail.com>
 Ratikesh Misra <ratikesh92@gmail.com>
 Ravindra Barthwal <ravindrabarthwal@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
index c8e30b84e5e8b5..5c4ddb8815bb1e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3219,7 +3219,7 @@ James Addison <jay@jp-hosting.net>
 Fabian Cook <hello@fabiancook.dev>
 Kalvin Vasconcellos <kalvin.vasconcellos@gmail.com>
 marsonya <akhil.marsonya27@gmail.com>
-Qingyu Deng <bitdqy@hotmail.com>
+Qingyu Deng <i@ayase-lab.com>
 Matin Zadehdolatabad <zadehdolatabad@gmail.com>
 Daniel Clark <daniec@microsoft.com>
 Sajal Khandelwal <skhandelwa22@bloomberg.net>
@@ -3291,7 +3291,6 @@ bl-ue <bl-ue@users.noreply.github.com>
 npm-robot <ops+robot@npmjs.com>
 Shaun Keys <mariobuddy@gmail.com>
 Simone Busoli <simone.busoli@nearform.com>
-Qingyu Deng <i@ayase-lab.com>
 Derevianchenko Maksym <32910350+maks-white@users.noreply.github.com>
 RA80533 <32469082+RA80533@users.noreply.github.com>
 Mao Wtm <m@maowtm.org>