Update search_index.rs

notriddle · notriddle · commit 6bcca5b6a045 · 2024-04-08T17:07:20.000-07:00
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;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-<<<<<<< HEAD`
`2`	`1`	`pub(crate) mod encode;`
`3`	`2`
`4`	`3`	`use std::collections::hash_map::Entry;`