Merge pull request #360 from cta-observatory/update-mailmap

marialainez · web-flow · commit dc0cee0a4250 · 2025-10-10T13:00:38.000+02:00
Update .mailmap
diff --git a/.mailmap b/.mailmap
@@ -1,6 +1,7 @@
 Andres Baquero <obaquero@ucm.es> andres-baquero <obaquero@ucm.es>
 
-Daniel Morcuende <dmorcuen@ucm.es> morcuended <dmorcuen@ucm.es>
+Daniel Morcuende <daniel.morcuende@cta-observatory.org> morcuended <dmorcuen@ucm.es>
+Daniel Morcuende <daniel.morcuende@cta-observatory.org> morcuended <dmorcuende@iaa.es>
 
 Jose Luis Contreras <jlcontreras@fis.ucm.es> Jose Contreras <jose.contreras@cp02.ctan.cta-observatory.org>
 Jose Luis Contreras <jlcontreras@fis.ucm.es> Jose Luis Contreras <pda.jl.contreras@gmail.com>

-Original file line number
+Diff line change
@@ @@ -1,6 +1,7 @@ @@
 Andres Baquero <[email protected]> andres-baquero <[email protected]>
 -Daniel Morcuende <[email protected]> morcuended <[email protected]>
 +Daniel Morcuende <[email protected]> morcuended <[email protected]>
 +Daniel Morcuende <[email protected]> morcuended <[email protected]>
 Jose Luis Contreras <[email protected]> Jose Contreras <[email protected]>
 Jose Luis Contreras <[email protected]> Jose Luis Contreras <[email protected]>