Merge pull request #36467 from ahoppen/pr/update-mailmap

swift-ci · web-flow · commit 2d6ded23e6e7 · 2021-03-17T11:14:36.000-07:00
diff --git a/.mailmap b/.mailmap
@@ -1,7 +1,7 @@
 Adrian-Constantin Popescu <epsilon.gamma@gmail.com> <adrian-constantin.popescu@outlook.com>
 Alex Blewitt <alblue@apple.com> <alex.blewitt@gmail.com>
-Alex Hoppen <alex@alexhoppen.de> <alex@ateamer.de>
-Alex Hoppen <alex@alexhoppen.de> <ahoppen@apple.com>
+Alex Hoppen <ahoppen@apple.com> <alex@ateamer.de>
+Alex Hoppen <ahoppen@apple.com> <alex@alexhoppen.de>
 Alexis Beingessner <abeingessner@apple.com> <a.beingessner@gmail.com>
 Alper Çugun <github@alper.nl> <alper@users.noreply.github.com>
 Amr Aboelela <amraboelela@gmail.com> <amraboelela@users.noreply.github.com>

-Original file line number
+Diff line change
@@ @@ -1,7 +1,7 @@ @@
 Adrian-Constantin Popescu <[email protected]> <[email protected]>
 Alex Blewitt <[email protected]> <[email protected]>
 -Alex Hoppen <[email protected]> <[email protected]>
 -Alex Hoppen <[email protected]> <[email protected]>
 +Alex Hoppen <[email protected]> <[email protected]>
 +Alex Hoppen <[email protected]> <[email protected]>
 Alexis Beingessner <[email protected]> <[email protected]>
 Alper Çugun <[email protected]> <[email protected]>
 Amr Aboelela <[email protected]> <[email protected]>