Update rust-attributes.cc

Rust-GCC · Jan 13, 2025 · 1ebcb1b · 1ebcb1b
1 parent bb2dd7d
commit 1ebcb1b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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)
 {