Home Explore Help
Sign In
CityApper
/
django
mirror of https://github.com/django/django
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Removed stray conflict line in 1.7.2 release notes.

Tim Graham 10 years ago
parent
8d7a48027e
commit
17c4013028
1 changed files with 0 additions and 1 deletions
Split View Show Diff Stats
  1. 0 1
      docs/releases/1.7.2.txt

+ 0 - 1
docs/releases/1.7.2.txt
View File 

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