meta: consolidate AUTHORS entries for alexzherdev

Trott · targos · commit 18296c3d8e5b · 2021-11-06T10:57:05.000+01:00
PR-URL: #40620 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/.mailmap b/.mailmap
@@ -12,6 +12,7 @@ Alex Hultman <alexhultman@gmail.com> <alexhultman@localhost.localdomain>
 Alex Jordan <alex@strugee.net>
 Alex Kocharin <rlidwka@kocharin.ru>
 Alex Kocharin <rlidwka@kocharin.ru> <alex@kocharin.ru>
+Alex Zherdev <alex.zherdev@gmail.com> <alex_zherdev@acl.com>
 Alexander Marchenko <axvmindaweb@gmail.com>
 Alexey Kupershtokh <alexey.kupershtokh@gmail.com> <wicked@alawar.com>
 Alexis Campailla <alexis@janeasystems.com> <orangemocha@github.com>
diff --git a/AUTHORS b/AUTHORS
@@ -2833,7 +2833,7 @@ akitsu-sanae <akitsu.sanae@gmail.com>
 Minuk Park <parkm86@gmail.com>
 Jim Schlight <jim@inspiredware.com>
 Theotime Poisseau <theotime.poisseau@gmail.com>
-Alex Zherdev <alex_zherdev@acl.com>
+Alex Zherdev <alex.zherdev@gmail.com>
 dev-313 <shekhawat.dev313@gmail.com>
 Michael Perrotte <mike@npmjs.com>
 Alexandre Ferrando <alferpal@gmail.com>
@@ -2914,7 +2914,6 @@ jens-cappelle <jens.jan.cappelle@gmail.com>
 bruce-one <bryce@gibson-consulting.com.au>
 Jason Macgowan <jason.macgowan@icloud.com>
 Vincent Dhennin <vincent.dhennin@viacesi.fr>
-Alex Zherdev <alex.zherdev@gmail.com>
 Jeny <yenymzo@gmail.com>
 Tchoupinax <corentinfiloche@hotmail.fr>
 Sebastien Ahkrin <sebastien48criquet@gmail.com>

-Original file line number
+Diff line change
 Alex Jordan <[email protected]>
 Alex Kocharin <[email protected]>
 Alex Kocharin <[email protected]> <[email protected]>
 +Alex Zherdev <[email protected]> <[email protected]>
 Alexander Marchenko <[email protected]>
 Alexey Kupershtokh <[email protected]> <[email protected]>
 Alexis Campailla <[email protected]> <[email protected]>
-Original file line number
+Diff line change
 Minuk Park <[email protected]>
 Jim Schlight <[email protected]>
 Theotime Poisseau <[email protected]>
 -Alex Zherdev <alex_zherdev@acl.com>
 +Alex Zherdev <alex.zherdev@gmail.com>
 dev-313 <[email protected]>
 Michael Perrotte <[email protected]>
 Alexandre Ferrando <[email protected]>
 bruce-one <[email protected]>
 Jason Macgowan <[email protected]>
 Vincent Dhennin <[email protected]>
 -Alex Zherdev <[email protected]>
 Jeny <[email protected]>
 Tchoupinax <[email protected]>
 Sebastien Ahkrin <[email protected]>