Removed stray conflict line in 1.7.2 release notes.

2014-12-04 15:31:55 -05:00 · 2014-12-04 15:31:55 -05:00 · 17c4013028
parent 8d7a48027e
commit 17c4013028
1 changed files with 0 additions and 1 deletions
--- a/docs/releases/1.7.2.txt
+++ b/docs/releases/1.7.2.txt
@ -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`).