From 70d38c70f7f16484d3a56781cd2737765f229222 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Fri, 17 May 2013 23:16:26 -0500
Subject: [PATCH] Update history to reflect merge of #1115

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

diff --git a/History.markdown b/History.markdown
index 02ae255f..41f5aada 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,7 @@
 ### Minor Enhancements
   * Move the building of related posts into their own class (#1057)
   * Removed trailing spaces in several places throughout the code (#1116)
+  * Add a `--force` option to `jekyll new` (#1115)
 
 ### Bug Fixes
   * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)