]> git.lizzy.rs Git - rust.git/commit
Fix bad merge in #49991
authorWesley Wiser <wwiser@gmail.com>
Fri, 20 Apr 2018 13:12:59 +0000 (09:12 -0400)
committerGitHub <noreply@github.com>
Fri, 20 Apr 2018 13:12:59 +0000 (09:12 -0400)
commitee9a4720eeaf82bb0fa9d1a02325131df51385c7
treefb49275472f86481a226b35cbb4a2bc47126ca10
parent85f5dd489ea1cb93707ba1ddf4a7678d3aee3f74
Fix bad merge in #49991

When I rebased #49991 on `master`, I messed up the merge for this line. I'm reverting this back to the way it was in f15e5c1.
src/librustc_metadata/encoder.rs