From 4900dd2e5ccd5cd9a67f0d7c908a15c5a24067ab Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Fri, 18 Apr 2025 21:21:15 +0200
Subject: [PATCH] Fix `rustc_codegen_gcc/tests/run/return-tuple.rs` test

---
 tests/run/return-tuple.rs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/run/return-tuple.rs b/tests/run/return-tuple.rs
index c6e1ba7ce394..c1254c51ce91 100644
--- a/tests/run/return-tuple.rs
+++ b/tests/run/return-tuple.rs
@@ -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]