From 3554b73b7fcbafc21afe0e1771b0635d50d5f365 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sun, 16 Oct 2022 04:48:26 -0700
Subject: [PATCH] Update history to reflect merge of #9141 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index d510fcac..bccd79cd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -90,6 +90,7 @@
   * Ensure theme config is a `Jekyll::Configuration` object (#8988)
   * Remove misleading totals row from `--profile` table (#9039)
   * Unlock Psych dependency (#9135)
+  * Fix false positive conflicts for static files in a collection (#9141)
 
 ### Development Fixes