Fix merge conflicts

rust-lang · Sep 7, 2024 · b5ac9b5 · b5ac9b5
1 parent 5f8fc79
commit b5ac9b5
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/compiler/rustc_lint/src/lib.rs b/compiler/rustc_lint/src/lib.rs
@@ -31,7 +31,6 @@
 #![doc(rust_logo)]
 #![feature(array_windows)]
 #![feature(assert_matches)]
-#![feature(box_patterns)]
 #![feature(box_into_inner)]
 #![feature(box_patterns)]
 #![feature(control_flow_enum)]