branch: elpa/julia-mode
commit 137455a82b080f49083fd6dc785a663c0b18e4f1
Author: Viral B. Shah <vi...@mayin.org>
Commit: Yichao Yu <yyc1...@gmail.com>
Update mailmap
---
.mailmap | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.mailmap b/.mailmap
index 3571422..9453498 100644
--- a/.mailmap
+++ b/.mailmap
@@ -98,9 +98,12 @@ Isaiah Norton <isaiah.nor...@gmail.com>
<inor...@bwh.harvard.edu>
Blake Johnson <blakejohnso...@gmail.com> <blakejohnso...@gmail.com>
Blake Johnson <blakejohnso...@gmail.com> <bjohn...@bbn.com>
-Marcus Silva <marcus.ps+git...@gmail.com> <marcus.ps+git...@gmail.com>
-Marcus Silva <marcus.ps+git...@gmail.com> <msi...@bbn.com>
+Marcus Silva <msi...@bbn.com> <msi...@bbn.com>
+Marcus Silva <msi...@bbn.com> <marcus.ps+git...@gmail.com>
Amit Murthy <amit.mur...@gmail.com> <amit.mur...@gmail.com>
Tanmay Mohapatra <tanma...@gmail.com> <tanma...@gmail.com>
+
+Dan Luu <dan...@gmail.com> <dan...@gmail.com>
+Dan Luu <dan...@gmail.com> <Dan>
