From 27dc68ed7b454fd402542cea205e7fdb4ea06e02 Mon Sep 17 00:00:00 2001
From: "Node.js GitHub Bot" <github-bot@iojs.org>
Date: Sun, 29 May 2022 00:25:23 +0000
Subject: [PATCH 1/2] meta: update AUTHORS

---
 AUTHORS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 323f8ffb084ed5..e4941dd68cfd1e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3459,5 +3459,7 @@ Sergey Nazaryev <sergey@nazaryev.com>
 William Marlow <william.marlow@ibm.com>
 Keyhan Vakil <60900335+airtable-keyhanvakil@users.noreply.github.com>
 Feng Yu <F3n67u@outlook.com>
+Shogun <ShogunPanda@users.noreply.github.com>
+pupilTong <pupiltong@outlook.com>
 
 # Generated by tools/update-authors.mjs

From d46270e1ac5f4c12d057151bd2eaf8dc688a0401 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 28 May 2022 18:46:45 -0700
Subject: [PATCH 2/2] fixup! meta: update AUTHORS

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

diff --git a/.mailmap b/.mailmap
index 00364e096d4554..3143501352576a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -378,14 +378,15 @@ Nitzan Uziely <linkgoron@gmail.com> <Linkgoron@users.noreply.github.com>
 Nitzan Uziely <linkgoron@gmail.com> <nitzan@testim.io>
 Noah Rose Ledesma <noahroseledesma@seattleacademy.org>
 npm team <ops+robot@npmjs.com>
-npm team <ops+robot@npmjs.com> <npm team>
 npm team <ops+robot@npmjs.com> <npm CLI robot>
+npm team <ops+robot@npmjs.com> <npm team>
 Oliver Chang <ochang@chromium.org>
 Oluwaseun Omoyajowo <omoyajowo2015@gmail.com>
 OneNail <OneNail@yeah.net> <onenail@yeah.net>
 Onne Gorter <onne@onnlucky.com>
 Oscar Martinez <oscar@mtnz-web.com> <oscar.martinez@hautelook.com>
 Paolo Insogna <paolo@cowtech.it>
+Paolo Insogna <paolo@cowtech.it> <ShogunPanda@users.noreply.github.com>
 Paul Graham <homosaur@gmail.com> <paul@bytefair.com>
 Paul Querna <pquerna@apache.org> <paul@querna.org>
 Pedro Lima <pvsousalima@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index e4941dd68cfd1e..1fb28b09d3bb64 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3459,7 +3459,6 @@ Sergey Nazaryev <sergey@nazaryev.com>
 William Marlow <william.marlow@ibm.com>
 Keyhan Vakil <60900335+airtable-keyhanvakil@users.noreply.github.com>
 Feng Yu <F3n67u@outlook.com>
-Shogun <ShogunPanda@users.noreply.github.com>
 pupilTong <pupiltong@outlook.com>
 
 # Generated by tools/update-authors.mjs