From 426830107116edb91a8c14e56ae390ba9ae7e3a2 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Thu, 10 Nov 2016 13:02:10 -0800
Subject: [PATCH] Update history to reflect merge of #5546 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b2ae50f0..16af17c8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -36,6 +36,7 @@
   * Restrict Rubocop version (#5496)
   * include a hashbang for all benchmark scripts & make them executable (#5505)
   * Update source in script/proof (#5538)
+  * Collections.feature: conditional steps to have it pass on Windows (#5546)
 
 ### Minor Enhancements