]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4929fa 700034b)
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)
6927: Do not merge imports with different attributes r=lnicola a=Jesse-Bakker

Fixes #6925

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

Trivial merge
Empowering everyone to build reliable and efficient software.