From: Pádraig Brady <P@draigBrady.com>
Date: Mon, 2 Oct 2017 00:30:51 +0000 (-0700)
Subject: maint: remove a duplicate entry from THANKS
X-Git-Tag: v8.29~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6774b991dbfcd428a58f8be50f3f505ac036f127;p=thirdparty%2Fcoreutils.git

maint: remove a duplicate entry from THANKS

* .mailmap: Prefer Colin Watson's last used email address.
---

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>