diff options
| author | Tim Graham <timograham@gmail.com> | 2014-12-04 15:31:55 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-12-04 15:31:55 -0500 |
| commit | 17c401302858bccfb607b5bade0714328b11cb0d (patch) | |
| tree | e39f73b8df1be018e635208ba135232511db1db9 /docs | |
| parent | 8d7a48027ef6848f693f57ae442a1b0ace0ebcdc (diff) | |
Removed stray conflict line in 1.7.2 release notes.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/releases/1.7.2.txt | 1 |
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`). |