Commit 17c40130 authored by Tim Graham's avatar Tim Graham
Browse files

Removed stray conflict line in 1.7.2 release notes.

parent 8d7a4802

docs/releases/1.7.2.txt

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ Bugfixes 
* Fixed ``runserver`` crash when socket error message contained Unicode

  characters (:ticket:`23946`).



<<<<<<< HEAD

* Fixed serialization of ``type`` when adding a ``deconstruct()`` method

  (:ticket:`23950`).