summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.7.2.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/releases/1.7.2.txt b/docs/releases/1.7.2.txt
index f6b40f32b7..884a5970b1 100644
--- 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`).