From 6bcca5b6a04588aaf3edcf7a0884a8f3fdc29c56 Mon Sep 17 00:00:00 2001
From: Michael Howell <michael@notriddle.com>
Date: Sat, 13 Jan 2024 16:44:39 -0700
Subject: [PATCH] Update search_index.rs

---
 src/librustdoc/html/render/search_index.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/librustdoc/html/render/search_index.rs b/src/librustdoc/html/render/search_index.rs
index 917be7cc8e9f..6d2bb31ee133 100644
--- 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;