Merge pull request #2 from larsoner/mm

effigies · web-flow · commit 4ab707c5fe89 · 2019-03-11T10:51:11.000-04:00
BUG: larsoner
diff --git a/.mailmap b/.mailmap
@@ -25,6 +25,7 @@ Cindee Madison <cindee@berkeley.edu> cindeem <cindee@berkeley.edu>
 Demian Wassermann <demian@bwh.harvard.edu> Demian Wassermann <demian.wassermann@inria.fr>
 Dimitri Papadopoulos Orfanos <dimitri.papadopoulos@cea.fr> Dimitri Papadopoulos <DimitriPapadopoulos@users.noreply.github.com>
 Eric Larson <larson.eric.d@gmail.com> Eric89GXL <larson.eric.d@gmail.com>
+Eric Larson <larson.eric.d@gmail.com> larsoner <larson.eric.d@gmail.com>
 Fernando Pérez-García <fepegar@gmail.com> Fernando <fepegar@gmail.com>
 Félix C. Morency <felix.morency@gmail.com> Felix C. Morency <felix.c.morency@usherbrooke.ca>
 Félix C. Morency <felix.morency@gmail.com> Félix C. Morency <felix.c.morency@usherbrooke.ca>
diff --git a/.zenodo.json b/.zenodo.json
@@ -43,7 +43,9 @@
       "orcid": "0000-0001-5194-6056"
     },
     {
-      "name": "Larson, Eric"
+      "affiliation": "University of Washington: Seattle, WA, United States",
+      "name": "Larson, Eric",
+      "orcid": "0000-0003-4782-5360"
     },
     {
       "affiliation": "Institute of Neuroinformatics, ETH/University of Zurich",

-Original file line number
+Diff line change
 Demian Wassermann <[email protected]> Demian Wassermann <[email protected]>
 Dimitri Papadopoulos Orfanos <[email protected]> Dimitri Papadopoulos <[email protected]>
 Eric Larson <[email protected]> Eric89GXL <[email protected]>
 +Eric Larson <[email protected]> larsoner <[email protected]>
 Fernando Pérez-García <[email protected]> Fernando <[email protected]>
 Félix C. Morency <[email protected]> Felix C. Morency <[email protected]>
 Félix C. Morency <[email protected]> Félix C. Morency <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,9 @@`
`43`	`43`	`"orcid": "0000-0001-5194-6056"`
`44`	`44`	`},`
`45`	`45`	`{`
`46`		`- "name": "Larson, Eric"`
	`46`	`+ "affiliation": "University of Washington: Seattle, WA, United States",`
	`47`	`+ "name": "Larson, Eric",`
	`48`	`+ "orcid": "0000-0003-4782-5360"`
`47`	`49`	`},`
`48`	`50`	`{`
`49`	`51`	`"affiliation": "Institute of Neuroinformatics, ETH/University of Zurich",`