From 2e04bb380d81c750fd44d225b5316fd395d7d4f7 Mon Sep 17 00:00:00 2001
From: Chris Michael <cpmichael@osg.samsung.com>
Date: Tue, 2 Feb 2016 15:02:20 -0500
Subject: [PATCH] elementary: update mailmap addresses

Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
---
 legacy/elementary/.mailmap | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/legacy/elementary/.mailmap b/legacy/elementary/.mailmap
index d9d68523c4..0bb03a3289 100644
--- a/legacy/elementary/.mailmap
+++ b/legacy/elementary/.mailmap
@@ -17,10 +17,10 @@ Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vtorri@univ-evry.fr>
 Tom Hacohen <tom@stosb.com> Tom 'TAsn' Hacohen <tom@stosb.com>
 Tom Hacohen <tom@stosb.com> Tom <tom@stosb.com>
 Gustavo Sverzut Barbieri <barbieri@gmail.com> Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
-Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael1@comcast.net>
+Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@comcast.net>
 Christopher Michael <devilhorns@comcast.net> Christopher Michael <cp.michael@samsung.com>
-Christopher Michael <devilhorns@comcast.net> Chris Michael <cp.michael@samsung.com>
-Christopher Michael <devilhorns@comcast.net> Chris Michael <devilhorns@comcast.net>
+Christopher Michael <devilhorns@comcast.net> Christopher Michael <devilhorns@comcast.net>
+Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@osg.samsung.com>
 Sebastian Dransfeld <sd@tango.flipp.net> Sebastian Dransfeld <sebastian.dransfeld@sintef.no>
 Sebastian Dransfeld <sd@tango.flipp.net> sebastid <sebastid>
 Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <m.blumenkran@samsung.com>