Rollup merge of #78105 - lcnr:namesNstuff, r=Mark-Simulacrum

JohnTitor · web-flow · commit aebeec7e5aa5 · 2020-10-20T12:11:10.000+09:00
change name in .mailmap
diff --git a/.mailmap b/.mailmap
@@ -29,7 +29,6 @@ Ariel Ben-Yehuda <arielb1@mail.tau.ac.il> arielb1 <arielb1@mail.tau.ac.il>
 Austin Seipp <mad.one@gmail.com> <as@hacks.yi.org>
 Aydin Kim <ladinjin@hanmail.net> aydin.kim <aydin.kim@samsung.com>
 Barosl Lee <vcs@barosl.com> Barosl LEE <github@barosl.com>
-Bastian Kauschke <bastian_kauschke@hotmail.de>
 Ben Alpert <ben@benalpert.com> <spicyjalapeno@gmail.com>
 Ben Sago <ogham@users.noreply.github.com> Ben S <ogham@bsago.me>
 Ben Sago <ogham@users.noreply.github.com> Ben S <ogham@users.noreply.github.com>
@@ -161,6 +160,7 @@ Kyle J Strand <batmanaod@gmail.com> <kyle.j.strand@gmail.com>
 Kyle J Strand <batmanaod@gmail.com> <kyle.strand@pieinsurance.com>
 Kyle J Strand <batmanaod@gmail.com> <kyle.strand@rms.com>
 Laurențiu Nicola <lnicola@dend.ro>
+lcnr <bastian_kauschke@hotmail.de>
 Lee Jeffery <leejeffery@gmail.com> Lee Jeffery <lee@leejeffery.co.uk>
 Lee Wondong <wdlee91@gmail.com>
 Lennart Kudling <github@kudling.de>

-Original file line number
+Diff line change
 Austin Seipp <[email protected]> <[email protected]>
 Aydin Kim <[email protected]> aydin.kim <[email protected]>
 Barosl Lee <[email protected]> Barosl LEE <[email protected]>
 -Bastian Kauschke <[email protected]>
 Ben Alpert <[email protected]> <[email protected]>
 Ben Sago <[email protected]> Ben S <[email protected]>
 Ben Sago <[email protected]> Ben S <[email protected]>
 Kyle J Strand <[email protected]> <[email protected]>
 Kyle J Strand <[email protected]> <[email protected]>
 Laurențiu Nicola <[email protected]>
 +lcnr <[email protected]>
 Lee Jeffery <[email protected]> Lee Jeffery <[email protected]>
 Lee Wondong <[email protected]>
 Lennart Kudling <[email protected]>