From 1dbf4f956f3c2e5f73590018e4429b19be2ead61 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Fri, 9 May 2014 13:11:50 -0500
Subject: [PATCH] Removing incorrect "No Changes" after merge conflicts

---
 changelog.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/changelog.rst b/changelog.rst
index eae6a2b8361..ef4f2f3226c 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -240,7 +240,6 @@ New Documentation
 
 - `d52f3f8 <https://github.com/symfony/symfony-docs/commit/d52f3f8a146356e9e114474e820f8ec6ac5f2374>`_ #3454 [Security] Add host option (ghostika)
 - `6b3c424 <https://github.com/symfony/symfony-docs/commit/6b3c424034fec441a32d8305600c1c26936b8f1e>`_ #3428 Translation - Added info about JsonFileLoader added in 2.4 (singles)
-No changes
 
 Fixed Documentation
 ~~~~~~~~~~~~~~~~~~~