From dcf05812c223d2a5b976d9f9e6929ff2f2c97c62 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Thu, 25 Jan 2024 09:56:14 +0100
Subject: [PATCH] Add Conrad and Thorsten to .mailmap file

---
 .mailmap | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.mailmap b/.mailmap
index 1064df3b50..95c6553042 100644
--- a/.mailmap
+++ b/.mailmap
@@ -37,3 +37,8 @@ Nathan Sobo <nathan@zed.dev> <nathan@warp.dev>
 Nathan Sobo <nathan@zed.dev> <nathansobo@gmail.com>
 Piotr Osiewicz <piotr@zed.dev>
 Piotr Osiewicz <piotr@zed.dev> <24362066+osiewicz@users.noreply.github.com>
+Conrad Irwin <conrad@zed.dev>
+Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>
+Thorsten Ball <thorsten@zed.dev>
+Thorsten Ball <thorsten@zed.dev> <mrnugget@gmail.com>
+Thorsten Ball <thorsten@zed.dev> <me@thorstenball.com>