From ae3f8b1eda57b266389a5f3ae89de243f005084f Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 30 Jul 2021 20:51:19 -0700
Subject: [PATCH] meta: add mailmap entry for uttampawar

This consolidates two email addresses/entries in AUTHORS into one.

PR-URL: https://github.com/nodejs/node/pull/39596
Reviewed-By: Ujjwal Sharma <ryzokuken@disroot.org>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
---
 .mailmap | 1 +
 AUTHORS  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 3fc88b0a8045a6..40b9ce8c8c4022 100644
--- a/.mailmap
+++ b/.mailmap
@@ -429,6 +429,7 @@ Trivikram Kamat <trivikr.dev@gmail.com> <16024985+trivikr@users.noreply.github.c
 ttzztztz <ttzztztz@outlook.com> <yangziyue80@outlook.com>
 Tyler Larson <talltyler@gmail.com>
 Ujjwal Sharma <ryzokuken@disroot.org> <usharma1998@gmail.com>
+Uttam Pawar <upawar@gmail.com> <uttam.c.pawar@intel.com>
 Viktor Karpov <viktor.s.karpov@gmail.com>
 Vincent Voyer <v@fasterize.com>
 Vladimir de Turckheim <vlad2t@hotmail.com>
diff --git a/AUTHORS b/AUTHORS
index 33e8891906e612..3570b282cbe226 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1255,7 +1255,7 @@ J Scott Chapman <scott8675309@gmail.com>
 Erez Weiss <ruggertech@gmail.com>
 Scott Smereka <scott.smereka@gmail.com>
 Fabrice Tatieze <fabrice.tatieze@nike.com>
-Uttam Pawar <uttam.c.pawar@intel.com>
+Uttam Pawar <upawar@gmail.com>
 Ben Lugavere <b.lugavere@gmail.com>
 Punit Buch <punit.buch@gmail.com>
 mark hughes <mrhughes@xogrp.com>
@@ -2672,7 +2672,6 @@ Amit Zur <sendwithchibo@gmail.com>
 Thang Tran <trankimthang279@gmail.com>
 Kai <Schweinepriester@users.noreply.github.com>
 Abhishek Agarwal <abhishek.agr31@gmail.com>
-Uttam Pawar <upawar@gmail.com>
 Jon Kunkee <jkunkee@microsoft.com>
 Mukul Khanna <mukul18khanna@gmail.com>
 Jarrod Connolly <jarrod@nestedquotes.ca>