fix merge conflicts

[rust.git] / src / test / ui / nll / issue-51268.rs

diff --git a/src/test/ui/nll/issue-51268.rs b/src/test/ui/nll/issue-51268.rs
index c14146a3de2a1d0b5864de21aa463d0add02e228..12d0449abb19be4c1bc7755ab3f20b859f481215 100644 (file)
--- a/src/test/ui/nll/issue-51268.rs
+++ b/src/test/ui/nll/issue-51268.rs
@@ -1,7 +1,5 @@
 // ignore-tidy-linelength
 
-#![feature(nll)]
-
 struct Bar;
 
 impl Bar {