diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-18 14:32:53 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-12-18 14:32:53 +0000 |
| commit | 03c177af89efcc238053b59069eda2c1c6772622 (patch) | |
| tree | 399c065e36e79b70258b2f77c2bcff43572d98e2 /crates/hir_ty/src/test_db.rs | |
| parent | f4929fa9ccd0eda65c2b77fef163c31e33bfb89a (diff) | |
| parent | 700034bd5a46dd6e3b5aa6322522e42c2a665fe9 (diff) | |
Merge #6927
6927: Do not merge imports with different attributes r=lnicola a=Jesse-Bakker
Fixes #6925
Co-authored-by: Jesse Bakker <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/test_db.rs')
0 files changed, 0 insertions, 0 deletions