Fix rustc_codegen_gcc/tests/run/return-tuple.rs
test
This commit is contained in:
parent
e4ea67b3d7
commit
c123dc63ea
1 changed files with 0 additions and 6 deletions
|
@ -6,13 +6,7 @@
|
|||
// 10
|
||||
// 42
|
||||
|
||||
<<<<<<< HEAD
|
||||
#![feature(auto_traits, lang_items, no_core, intrinsics)]
|
||||
#![allow(internal_features)]
|
||||
|
||||
=======
|
||||
#![feature(no_core)]
|
||||
>>>>>>> db1a31c243a649e1fe20f5466ba181da5be35c14
|
||||
#![no_std]
|
||||
#![no_core]
|
||||
#![no_main]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue