From 6774b991dbfcd428a58f8be50f3f505ac036f127 Mon Sep 17 00:00:00 2001
From: =?utf8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Sun, 1 Oct 2017 17:30:51 -0700
Subject: [PATCH] maint: remove a duplicate entry from THANKS

* .mailmap: Prefer Colin Watson's last used email address.
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index c7a18cfb3a..dc04853c3a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -28,6 +28,7 @@ Pádraig Brady <P@draigBrady.com>
 <stephane.raimbault@gmail.com> <stephane.raimbault@makina-corpus.com>
 <jarkko.sakkinen@iki.fi> <jarkko.sakkinen@linux.intel.com>
 <tobias@stoeckmann.org> <tobias@bugol.de>
+<cjwatson@debian.org> <cjwatson@ubuntu.com>
 
 # Prefer spelled-out middle name and its address.
 Arne Henrik Juul <arnej@imf.unit.no> Arne H. Juul <arnej@solan.unit.no>
-- 
2.47.2