aboutsummaryrefslogtreecommitdiff
path: root/crates/hir_ty
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-12-18 14:32:53 +0000
committerGitHub <[email protected]>2020-12-18 14:32:53 +0000
commit03c177af89efcc238053b59069eda2c1c6772622 (patch)
tree399c065e36e79b70258b2f77c2bcff43572d98e2 /crates/hir_ty
parentf4929fa9ccd0eda65c2b77fef163c31e33bfb89a (diff)
parent700034bd5a46dd6e3b5aa6322522e42c2a665fe9 (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')
0 files changed, 0 insertions, 0 deletions