From 4b4a46579a3407fc2e1a9e019ec0aed2261248eb Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 18 Oct 2014 12:30:42 -0700
Subject: [PATCH] Update history to reflect merge of #3013 [ci skip]

---
 History.markdown | 1 -
 1 file changed, 1 deletion(-)

diff --git a/History.markdown b/History.markdown
index 5027b444..c2ed92d7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -18,7 +18,6 @@
     to watching in in 2.4.0 (#2922)
   * Fix code for media query mixin in site template (#2946)
   * Allow post URL's to have `.htm` extensions (#2925)
-  * Make permalink parsing consistent with pages, such that any file ext is allowed (#2921)
 
 ### Development Fixes