From 7e750f3230ad84777855ae416b8e25a586a10ed0 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Mon, 1 Jul 2013 09:53:34 -0500
Subject: [PATCH] Update history to reflect merge of #1118

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

diff --git a/History.markdown b/History.markdown
index adeb4211..a5c57e41 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,8 @@
     sites (#1245, #1247)
   * Add `redcarpet` as a runtime dependency so `jekyll build` works out-of-the-box for new
     sites. (#1247)
+  * In the generated site, remove files that will be replaced by a
+    directory (#1118)
 
 ### Bug Fixes
   * Fix pagination in subdirectories. (#1198)