summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorBrian Cline <bcline@us.ibm.com>2016-04-29 05:00:36 -0500
committerBrian Cline <bcline@us.ibm.com>2016-04-29 05:00:36 -0500
commit96c1838a15645639154f1048285d53a891809937 (patch)
tree3ec8a2ef060b81baee0b29f05c39f353715de4c8 /.mailmap
parent97349985696341be494e305fcaac41c61063e812 (diff)
downloadswift-96c1838a15645639154f1048285d53a891809937.tar.gz
Update mailmap, resolve identity crisis
Change-Id: Ia8e30a8c0f81068c259d5d08adad4f1a98460561
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index b640039bf..f82346287 100644
--- a/.mailmap
+++ b/.mailmap
@@ -101,3 +101,5 @@ Oshrit Feder <oshritf@il.ibm.com>
Larry Rensing <lr699s@att.com>
Ben Keller <bjkeller@us.ibm.com>
Chaozhe Chen <chaozhe.chen@easystack.cn>
+Brian Cline <bcline@softlayer.com> <bcline@us.ibm.com>
+Brian Cline <bcline@softlayer.com> <brian.cline@gmail.com>