Skip to content

D
django
Kaydet (Commit) 17c40130 authored tarafından Tim Graham's avatar Tim Graham
Dosyalara gözat
Seçenekler

Removed stray conflict line in 1.7.2 release notes.

üst 8d7a4802
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
docs/releases/1.7.2.txt
Dosyayı görüntüle @ 17c40130
...@@ -102,7 +102,6 @@ Bugfixes ...@@ -102,7 +102,6 @@ Bugfixes
* Fixed ``runserver`` crash when socket error message contained Unicode * Fixed ``runserver`` crash when socket error message contained Unicode
characters (:ticket:`23946`). characters (:ticket:`23946`).
<<<<<<< HEAD
* Fixed serialization of ``type`` when adding a ``deconstruct()`` method * Fixed serialization of ``type`` when adding a ``deconstruct()`` method
(:ticket:`23950`). (:ticket:`23950`).
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment