about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-05-03 18:34:01 -0400
committerGitHub <noreply@github.com>2017-05-03 18:34:01 -0400
commite2cedb249f00460247c015c9470b0a3e6d4fca85 (patch)
tree86ba0ff9f328d8ea4402d84f2dc5559186d2ce32 /src/libstd
parent10fde3393be6295c8df2ce6c016f3f37b25b58b7 (diff)
parentb1ab145ec265aaa9b6cc9978ae1ef222cdf9e018 (diff)
downloadrust-e2cedb249f00460247c015c9470b0a3e6d4fca85.tar.gz
rust-e2cedb249f00460247c015c9470b0a3e6d4fca85.zip
Rollup merge of #41715 - martinhath:master, r=aturon
Fix @martinhath's mailmap entry

I stumbled upon a name duplication issue in [rust-lang-nursery/thanks](https://github.com/rust-lang-nursery/thanks/), and realized that this problem is easily fixable. I've (hopefully) done the right thing here. It works locally (`git shortlog | grep "Thoresen"` only returns one entry instead of two).

I didn't bother creating an issue in the `thanks` repository, since I did the `.mailmap` editing myself.
Diffstat (limited to 'src/libstd')
0 files changed, 0 insertions, 0 deletions