p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed stray conflict line in 1.7.2 release notes.

This commit is contained in:
Tim Graham 2014-12-04 15:31:55 -05:00
parent 8d7a48027e
commit 17c4013028
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/releases/1.7.2.txt
View File

@ -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`).