Rename variable

Author: roxelo

core/src/marker.rs

@@ -31,10 +31,6 @@ use crate::hash::Hasher;
 /// [ub]: ../../reference/behavior-considered-undefined.html
 #[stable(feature = "rust1", since = "1.0.0")]
 #[cfg_attr(not(test), rustc_diagnostic_item = "send_trait")]
-<<<<<<< HEAD
-#[lang = "send"]
-=======
->>>>>>> Remove lang items Send, UnwindSafe and RefUnwindSafe
 #[rustc_on_unimplemented(
     message = "`{Self}` cannot be sent between threads safely",
     label = "`{Self}` cannot be sent between threads safely"