From 1ebcb1b0cfe061e88a3a80d1c3377335c382519f Mon Sep 17 00:00:00 2001
From: Om Swaroop Nayak <146124307+saeitoshi-10@users.noreply.github.com>
Date: Mon, 13 Jan 2025 23:33:44 +0530
Subject: [PATCH] Update rust-attributes.cc

---
 gcc/rust/util/rust-attributes.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcc/rust/util/rust-attributes.cc b/gcc/rust/util/rust-attributes.cc
index a278ff8115d..e8fe2c13482 100644
--- a/gcc/rust/util/rust-attributes.cc
+++ b/gcc/rust/util/rust-attributes.cc
@@ -37,7 +37,6 @@ Attributes::is_known (const std::string &attribute_path)
 
   return !lookup.is_error ();
 }
-<<<<<<< HEAD
 bool
 Attributes::is_macro_export (const AST::AttrVec outer_attrs)
 {