]> git.lizzy.rs Git - rust.git/commit
Merge #6927
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>
Fri, 18 Dec 2020 14:32:53 +0000 (14:32 +0000)
committerGitHub <noreply@github.com>
Fri, 18 Dec 2020 14:32:53 +0000 (14:32 +0000)
commit03c177af89efcc238053b59069eda2c1c6772622
tree399c065e36e79b70258b2f77c2bcff43572d98e2
parentf4929fa9ccd0eda65c2b77fef163c31e33bfb89a
parent700034bd5a46dd6e3b5aa6322522e42c2a665fe9
Merge #6927

6927: Do not merge imports with different attributes r=lnicola a=Jesse-Bakker

Fixes #6925

Co-authored-by: Jesse Bakker <github@jessebakker.com>