From 06f757f3574d99a2436ceeac8c9b5415db8febb7 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Thu, 9 Sep 2021 06:08:43 -0700
Subject: [PATCH] meta: consolidate AUTHORS entry for mikemaccana

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

diff --git a/.mailmap b/.mailmap
index f691ac78ae2284..80bc179f8ac66a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -287,6 +287,7 @@ Micleusanu Nicu <micnic90@gmail.com>
 Miguel Angel Asencio Hurtado <maasencioh@gmail.com>
 Mikael Bourges-Sevenier <mikeseven@gmail.com> <msevenier@motorola.com>
 Mike Kaufman <mike.kaufman@microsoft.com> <mkaufman@microsoft.com>
+Mike MacCana <mike.maccana@gmail.com> <mike@certsimple.com>
 Minqi Pan <pmq2001@gmail.com>
 Minuk Park <parkm86@gmail.com>
 Minwoo Jung <nodecorelab@gmail.com> <jmwsoft@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index a7474dd6671a3d..36179f1faa0b3a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -744,7 +744,7 @@ Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
 AQNOUCH Mohammed <aqnouch.mohammed@gmail.com>
 Ivan Kozik <ivan@ludios.org>
 Oleg Elifantiev <oleg@elifantiev.ru>
-Mike MacCana <mike@certsimple.com>
+Mike MacCana <mike.maccana@gmail.com>
 Josh Gummersall <gumby@moz.com>
 Sam Mikes <smikes@cubane.com>
 Frederic Hemberger <mail@frederic-hemberger.de>
@@ -2780,7 +2780,6 @@ Ivan Villa <trezeguet55@gmail.com>
 Caleb ツ Everett <calebev@amazon.com>
 Miken <omarlozano053@gmail.com>
 Gabriela Niño <gabynr@gmail.com>
-Mike MacCana <mike.maccana@gmail.com>
 Tim Baverstock <tim.baverstock@corp.badoo.com>
 Walle Cyril <cyril.walle@protonmail.com>
 Xu Meng <dmabupt@gmail.com>