meta: add mailmap entry for branisha

Trott · targos · commit 259e0cf4d7df · 2021-09-06T09:19:21.000+02:00
Add mailmap entry to consolidate duplicate entries in AUTHORS file. PR-URL: #39889 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/.mailmap b/.mailmap
@@ -300,6 +300,7 @@ Nebu Pookins <nebu@nebupookins.net>
 Netto Farah <nettofarah@gmail.com>
 Nicholas Kinsey <pyrotechnick@feistystudios.com>
 Nick Soggin <nicksoggin@gmail.com> <iSkore@users.noreply.github.com>
+Nikola Glavina <glavina.nikola5@gmail.com> <nikola.glavina@student.um.si>
 Nikolai Vavilov <vvnicholas@gmail.com>
 Nils Kuhnhenn <lain@volafile.io>
 Nitzan Uziely <linkgoron@gmail.com> <nitzan@testim.io>
diff --git a/AUTHORS b/AUTHORS
@@ -3088,7 +3088,7 @@ Anentropic <ego@anentropic.com>
 Saleem <hamids2@asme.org>
 Julien Poissonnier <julien@caffeine.lu>
 zombieleet <zombieleetnca@gmail.com>
-Nikola Glavina <nikola.glavina@student.um.si>
+Nikola Glavina <glavina.nikola5@gmail.com>
 Johannes Schöpp <schoepp@rz.uni-frankfurt.de>
 Francisco Ryan Tolmasky I <tolmasky@gmail.com>
 Ye-hyoung Kang <keepyourhonor@gmail.com>
@@ -3167,7 +3167,6 @@ FeelyChau <feely@outlook.com>
 Darcy Clarke <darcy@darcyclarke.me>
 mayank agarwal <mayankagarwal44442@gmail.com>
 woodfairy <d.schmit@m3connect.de>
-Nikola Glavina <glavina.nikola5@gmail.com>
 Rishabh Mehan <darkrishabh@gmail.com>
 Andrew Casey <andrew.casey@microsoft.com>
 Anders Kaseorg <andersk@mit.edu>

-Original file line number
+Diff line change
 Netto Farah <[email protected]>
 Nicholas Kinsey <[email protected]>
 Nick Soggin <[email protected]> <[email protected]>
 +Nikola Glavina <[email protected]> <[email protected]>
 Nikolai Vavilov <[email protected]>
 Nils Kuhnhenn <[email protected]>
 Nitzan Uziely <[email protected]> <[email protected]>
-Original file line number
+Diff line change
 Saleem <[email protected]>
 Julien Poissonnier <[email protected]>
 zombieleet <[email protected]>
 -Nikola Glavina <nikola.glavina@student.um.si>
 +Nikola Glavina <glavina[email protected]>
 Johannes Schöpp <[email protected]>
 Francisco Ryan Tolmasky I <[email protected]>
 Ye-hyoung Kang <[email protected]>
 Darcy Clarke <[email protected]>
 mayank agarwal <[email protected]>
 woodfairy <[email protected]>
 -Nikola Glavina <[email protected]>
 Rishabh Mehan <[email protected]>
 Andrew Casey <[email protected]>
 Anders Kaseorg <[email protected]>