Update search_index.rs

rust-lang · Apr 9, 2024 · 6bcca5b · 6bcca5b
1 parent 7e7a87c
commit 6bcca5b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/librustdoc/html/render/search_index.rs b/src/librustdoc/html/render/search_index.rs
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 pub(crate) mod encode;
 
 use std::collections::hash_map::Entry;