From 17c401302858bccfb607b5bade0714328b11cb0d Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Thu, 4 Dec 2014 15:31:55 -0500
Subject: [PATCH] Removed stray conflict line in 1.7.2 release notes.

---
 docs/releases/1.7.2.txt | 1 -
 1 file changed, 1 deletion(-)

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