From 7a86de18397426e15d5ca26d4029f29245a47719 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Wed, 25 Aug 2021 19:33:03 -0700
Subject: [PATCH] meta: add mailmap entry for branisha

Add mailmap entry to consolidate duplicate entries in AUTHORS file.
---
 .mailmap | 1 +
 AUTHORS  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 1259ee1ae93caa..bc14b3157eed47 100644
--- 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
index c778c43179e5e4..907367e3125685 100644
--- 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>