From f8ed7555cd6b239a31934be183a6bae205757ec0 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 8 Aug 2021 07:04:14 -0700
Subject: [PATCH] meta: consolidate AUTHORS entries for ooHmartY
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 a400b3efd43..e53d4910903 100644
--- a/.mailmap
+++ b/.mailmap
@@ -305,6 +305,7 @@ Nitzan Uziely <linkgoron@gmail.com> <nitzan@testim.io>
 Noah Rose Ledesma <noahroseledesma@seattleacademy.org>
 Oluwaseun Omoyajowo <omoyajowo2015@gmail.com>
 Onne Gorter <onne@onnlucky.com>
+Oscar Martinez <oscar@mtnz-web.com> <oscar.martinez@hautelook.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 ffc7608edcd..213c03ba9f3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1205,7 +1205,7 @@ Daniel Pittman <daniel@pittmo.net>
 Ian White <ian.white.developer@gmail.com>
 Chris Bystrek <chris.bystrek@gmail.com>
 Christine Hong <christine@dogvacay.com>
-Oscar Martinez <oscar.martinez@hautelook.com>
+Oscar Martinez <oscar@mtnz-web.com>
 Aileen <avillanueva>
 David Bradford <dbradf@gmail.com>
 stokingerl <liamstokinger@gmail.com>
@@ -1480,7 +1480,6 @@ Tony Rice <tony@bestellensoftware.com>
 Olivier Martin <olivier4.martin@orange.com>
 jeyanthinath <jeyanthinath10@gmail.com>
 Aditya Anand <aditya.anandmc@gmail.com>
-Oscar Martinez <oscar@mtnz-web.com>
 cool88 <bhansur6@gmail.com>
 Steven Lehn <sjlehn@gmail.com>
 Łukasz Szewczak <lukaszewczak@gmail.com>