From 15c40b2ef51120974edc626106de69faa53dfc3f Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 18 Dec 2012 16:32:11 +0100
Subject: Fix changelog

---
 railties/CHANGELOG.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index a32f33140b..2aeab9bdf0 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,14 +1,12 @@
 ## Rails 4.0.0 (unreleased) ##
 
-<<<<<<< HEAD
 *   Add app/models/concerns and app/controllers/concerns to the default directory structure and load path *DHH*
 
     See http://37signals.com/svn/posts/3372-put-chubby-models-on-a-diet-with-concerns for usage instructions.
-=======
+
 *   The `rails/info/routes` now correctly formats routing output as an html table.
 
     *Richard Schneeman*
->>>>>>> f6d0eda918756bf56e2c05afcaaabda723487017
 
 *   The `public/index.html` is no longer generated for new projects.
     Page is replaced by internal `welcome_controller` inside of railties.
-- 
cgit v1.2.3