Skip to content
Browse files

Fix changelog

  • Loading branch information...
1 parent 09aeee7 commit 15c40b2ef51120974edc626106de69faa53dfc3f @dhh dhh committed Dec 18, 2012
Showing with 1 addition and 3 deletions.
  1. +1 −3 railties/CHANGELOG.md
View
4 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.

0 comments on commit 15c40b2

Please sign in to comment.
Something went wrong with that request. Please try again.