resolve conflicts
This commit is contained in:
parent
25919b09a9
commit
23c9a4a1ca
1 changed files with 1 additions and 0 deletions
|
@ -89,6 +89,7 @@
|
|||
#![allow(explicit_outlives_requirements)]
|
||||
#![warn(multiple_supertrait_upcastable)]
|
||||
#![cfg_attr(not(bootstrap), allow(internal_features))]
|
||||
#![cfg_attr(not(bootstrap), allow(rustdoc::redundant_explicit_links))]
|
||||
//
|
||||
// Library features:
|
||||
// tidy-alphabetical-start
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue