meta: consolidate AUTHORS entries for ooHmartY

Trott · targos · commit 4b2eee5232fd · 2021-09-04T15:14:50.000+02:00
PR-URL: #39705 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git 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
@@ -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>

-Original file line number
+Diff line change
 Noah Rose Ledesma <[email protected]>
 Oluwaseun Omoyajowo <[email protected]>
 Onne Gorter <[email protected]>
 +Oscar Martinez <[email protected]> <[email protected]>
 Paul Graham <[email protected]> <[email protected]>
 Paul Querna <[email protected]> <[email protected]>
 Pedro Lima <[email protected]>
-Original file line number
+Diff line change
 Ian White <[email protected]>
 Chris Bystrek <[email protected]>
 Christine Hong <[email protected]>
 -Oscar Martinez <oscar.martinez@hautelook.com>
 +Oscar Martinez <oscar@mtnz-web.com>
 Aileen <avillanueva>
 David Bradford <[email protected]>
 stokingerl <[email protected]>
 Olivier Martin <[email protected]>
 jeyanthinath <[email protected]>
 Aditya Anand <[email protected]>
 -Oscar Martinez <[email protected]>
 cool88 <[email protected]>
 Steven Lehn <[email protected]>
 Łukasz Szewczak <[email protected]>