From 20d493c694b77dd772935b9a9c76874e79aabacd Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Tue, 26 Oct 2021 19:34:08 -0700
Subject: [PATCH] meta: consolidate AUTHORS entries for Azard

---
 .mailmap | 1 +
 AUTHORS  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index eb72aa57cc2cc2..bd7ce4197cb2dc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -45,6 +45,7 @@ Ashley Maceli <ashley.maceli@gmail.com>
 Ashok Suthar <coderatlabs@gmail.com>
 Ashutosh Kumar Singh <singhjug1994@gmail.com>
 Atsuo Fukaya <fukayatsu@gmail.com>
+Azard <azardf4yy@gmail.com> <330815461@qq.com>
 Ben Lugavere <b.lugavere@gmail.com>
 Ben Noordhuis <info@bnoordhuis.nl> <ben@strongloop.com>
 Ben Noordhuis <info@bnoordhuis.nl> <bnoordhuis@bender.(none)>
diff --git a/AUTHORS b/AUTHORS
index 3e2f9f6fc82945..e436826aa18c79 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1535,7 +1535,7 @@ sallen450 <jqh101@sina.com>
 OriLev <sviatos@gmail.com>
 Zongmin Lei <leizongmin@gmail.com>
 lena <kaplanlena@gmail.com>
-Azard <330815461@qq.com>
+Azard <azardf4yy@gmail.com>
 Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
 Kyle Farnung <kfarnung@microsoft.com>
 Weijia Wang <starkwang@126.com>
@@ -1607,7 +1607,6 @@ Greg Alexander <gregory.l.alexander@gmail.com>
 dcharbonnier <d.charbonnier@oxys.net>
 Jared Kantrowitz <jared.kantrowitz@gmail.com>
 Guy Margalit <guymguym@gmail.com>
-Azard <azardf4yy@gmail.com>
 nishijayaraj <nishijayaraj@gmail.com>
 Nick Stanish <nickstanish@gmail.com>
 Mandeep Singh <mandeep25894@gmail.com>