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

@@ -39,11 +39,7 @@ declare_clippy_lint! {
     /// }
     /// ```
     #[clippy::version = "1.77.0"]
-<<<<<<<< HEAD:clippy_lints/src/missing_const_for_thread_local.rs
-    pub MISSING_CONST_FOR_THREAD_LOCAL,
-========
     pub 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
     perf,
     "suggest using `const` in `thread_local!` macro"
 }
@@ -59,11 +55,7 @@ impl MissingConstForThreadLocal {
     }
 }
 
-<<<<<<<< HEAD:clippy_lints/src/missing_const_for_thread_local.rs
-impl_lint_pass!(MissingConstForThreadLocal => [MISSING_CONST_FOR_THREAD_LOCAL]);
-========
 impl_lint_pass!(MissingConstForThreadLocal => [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
 
 #[inline]
 fn is_thread_local_initializer(