Fix changelog conflicts and remove release dates [ci skip]

rails · Mar 18, 2013 · a8e7a00 · a8e7a00
1 parent afcd01b
commit a8e7a00
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
@@ -4,7 +4,11 @@
     Fixes GH#3512.
 
     *Juan Barreneche*
-*   No changes.
+
+*   Fix `ActionDispatch::Request#formats` when the Accept request-header is an
+    empty string. Fix #7774 [Backport #8977, #9541]
+
+    *Soylent + Maxime Réty*
 
 
 ## Rails 3.2.13 ##
@@ -26,16 +30,6 @@
 
     *Olek Janiszewski*
 
-<<<<<<< HEAD
-*   Fix `ActionDispatch::Request#formats` when the Accept request-header is an
-    empty string. Fix #7774 [Backport #8977, #9541]
-
-    *Soylent + Maxime Réty*
-
-## Rails 3.2.13.rc1 (Feb 17, 2013) ##
-
-=======
->>>>>>> 3-2-13
 *   Determine the controller#action from only the matched path when using the
     shorthand syntax. Previously the complete path was used, which led
     to problems with nesting (scopes and namespaces).

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.13 (Feb 17, 2013) ##
+## unrelesed ##
 
 *   Reload the association target if it's stale. `@stale_state` should be nil
     when a model isn't saved.
@@ -13,7 +13,7 @@
     *kennyj*
 
 
-## Rails 3.2.13.rc1 (Feb 17, 2013) ##
+## Rails 3.2.13 ##
 
 *   Reverted 921a296a3390192a71abeec6d9a035cc6d1865c8, 'Quote numeric values
     compared to string columns.' This caused several regressions.

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
@@ -6,7 +6,7 @@
     *Andrew White*
 
 
-## Rails 3.2.13 (Feb 17, 2013) ##
+## Rails 3.2.13 ##
 
 
 *   Fix DateTime comparison with DateTime::Infinity object.