From 8366ce27673b82349361e534853256dc869a8f93 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 6 Oct 2015 09:52:19 +0200
Subject: deduplicate @xenopathic

---
 .mailmap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index a6cf996587c..95841a36353 100644
--- a/.mailmap
+++ b/.mailmap
@@ -304,7 +304,7 @@ Robin Appelman <icewind@owncloud.com> Robin <robin@Amaya.(none)>
 Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail.com>
 Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail>
 Robin Appelman <icewind@owncloud.com> Robin Appelman <robin@icewind.nl>
-Robin McCorkell <rmccorkell@karoshi.org.uk>
+Robin McCorkell <rmccorkell@karoshi.org.uk> Robin McCorkell <rmccorkell@owncloud.com>
 Rodrigo Hjort <rodrigo.hjort@gmail.com>
 Roeland Jago Douma <roeland@famdouma.nl>
 rok <brejktru@gmail.com>
-- 
cgit v1.2.3