Add changelog entry

sphinx-doc · Mar 3, 2024 · b3cb007 · b3cb007
1 parent 77dcb45
commit b3cb007
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -33,8 +33,13 @@ Features added
 Bugs fixed
 ----------
 
+<<<<<<< HEAD
 * #11958: HTML Search: Fix partial matches overwriting full matches.
  Patch by William Lachance.
+=======
+* #11959: Fix multiple term matching when word appears in both title and document.
+ Patch by Will Lachance.
+>>>>>>> 8b993fa3d (Add changelog entry)
 * #11944: Use anchor in search preview.
  Patch by Will Lachance.
 * #11668: Raise a useful error when ``theme.conf`` is missing.