merge conflicts

story645 · story645 · commit 910460e02afc · 2016-08-23T12:44:03.000-04:00
diff --git a/.mailmap b/.mailmap
@@ -1,23 +1,13 @@
 Adrien F. Vincent <vincent.adrien@gmail.com>
-<<<<<<< 3d31c694aa6b77b9d8b7b1897f3a67f5be1a54ea
 Andrew Dawson <ajdawson@acm.org> <dawson@atm.ox.ac.uk>
 anykraus <kraus@mpip-mainz.mpg.de> <anykraus@users.noreply.github.com>
 Ariel Hernán Curiale <curiale@gmail.com>
 Ben Cohen <bj.cohen19@gmail.com> <ben@cohen-family.org>
-Ben Root <ben.v.root@gmail.com>
-Casper van der Wel <caspervdw@gmail.com>
-Christoph Gohlke <cgohlke@uci.edu> <cgohlke@uci.edu>
-Cimarron Mittelsteadt <cimarronm@gmail.com>
-Daniel Hyams <dhyams@gmail.com>
-=======
-Andrew Dawson <ajdawson@acm.org> Andrew Dawson <dawson@atm.ox.ac.uk>
-anykraus <kraus@mpip-mainz.mpg.de> anykraus <anykraus@users.noreply.github.com>
-Ben Cohen <bj.cohen19@gmail.com> Ben Cohen <ben@cohen-family.org>
 Ben Root <ben.v.root@gmail.com> Benjamin Root <ben.v.root@gmail.com>
+Casper van der Wel <caspervdw@gmail.com>
 Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
 Christoph Gohlke <cgohlke@uci.edu> C. Gohlke <cgohlke@uci.edu>
 Cimarron Mittelsteadt <cimarronm@gmail.com> Cimarron <cimarronm@gmail.com>
->>>>>>> Merge pull request #6683 from afvincent/new_entry_mailmap_for_afvincent
 Daniel Hyams <dhyams@gmail.com> Daniel Hyams <dhyams@gitdev.(none)>
 David Kua <david@kua.io> <david.kua@mail.utoronto.ca>
 endolith <endolith@gmail.com>

-Original file line number
+Diff line change
@@ @@ -1,23 +1,13 @@ @@
 Adrien F. Vincent <[email protected]>
 -<<<<<<< 3d31c694aa6b77b9d8b7b1897f3a67f5be1a54ea
 Andrew Dawson <[email protected]> <[email protected]>
 anykraus <[email protected]> <[email protected]>
 Ariel Hernán Curiale <[email protected]>
 Ben Cohen <[email protected]> <[email protected]>
 -Ben Root <[email protected]>
 -Casper van der Wel <[email protected]>
 -Christoph Gohlke <[email protected]> <[email protected]>
 -Cimarron Mittelsteadt <[email protected]>
 -Daniel Hyams <[email protected]>
 -=======
 -Andrew Dawson <[email protected]> Andrew Dawson <[email protected]>
 -anykraus <[email protected]> anykraus <[email protected]>
 -Ben Cohen <[email protected]> Ben Cohen <[email protected]>
 Ben Root <[email protected]> Benjamin Root <[email protected]>
 +Casper van der Wel <[email protected]>
 Christoph Gohlke <[email protected]> cgohlke <[email protected]>
 Christoph Gohlke <[email protected]> C. Gohlke <[email protected]>
 Cimarron Mittelsteadt <[email protected]> Cimarron <[email protected]>
 ->>>>>>> Merge pull request #6683 from afvincent/new_entry_mailmap_for_afvincent
 Daniel Hyams <[email protected]> Daniel Hyams <dhyams@gitdev.(none)>
 David Kua <[email protected]> <[email protected]>
 endolith <[email protected]>