From 6869b62af34fd073b0f4fa45dcece4516f31f9bf Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 15 Feb 2024 18:35:43 -0500
Subject: [PATCH] Update `.mailmap` (#7871)

This PR updates the `.mailmap` file to merge some commit authors using
multiple emails.

Release Notes:

- N/A
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index fbd23aa5db..38a7b22f73 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,6 +11,8 @@
 
 Antonio Scandurra <me@as-cii.com>
 Antonio Scandurra <me@as-cii.com> <antonio@zed.dev>
+Christian Bergschneider <christian.bergschneider@gmx.de>
+Christian Bergschneider <christian.bergschneider@gmx.de> <magiclake@gmx.de>
 Conrad Irwin <conrad@zed.dev>
 Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>
 Greg Morenz <greg-morenz@droid.cafe>