Rename thread_local_initializer_can_be_made_const to missing_const_for_thread_local

Author: alex-semenyuk

clippy_lints/src/missing_const_for_thread_local.rs

@@ -113,11 +113,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingConstForThreadLocal {
         local_defid: rustc_span::def_id::LocalDefId,
     ) {
         let defid = local_defid.to_def_id();
-<<<<<<<< HEAD:clippy_lints/src/missing_const_for_thread_local.rs
         if self.msrv.meets(msrvs::MISSING_CONST_FOR_THREAD_LOCAL)
-========
-        if self.msrv.meets(msrvs::MISSING_CONST_FOR_THREAD_LOCAL)
->>>>>>>> 7a79fea9b (Rename thread_local_initializer_can_be_made_const to missing_const_for_tl_init):clippy_lints/src/missing_const_for_tl_init.rs
             && is_thread_local_initializer(cx, fn_kind, span).unwrap_or(false)
             // Some implementations of `thread_local!` include an initializer fn.
             // In the case of a const initializer, the init fn is also const,