From 1d16dec8032f3668864554a20d1f7dc4bd6cdd58 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Thu, 5 Apr 2012 23:41:16 +0700
Subject: [PATCH] Remove leftover line from git merge

---
 python-sphinx.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python-sphinx.spec b/python-sphinx.spec
index 5742275..af96bf1 100644
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -155,7 +155,6 @@ make test
 
 
 %changelog
-<<<<<<< HEAD
 * Thu Apr  5 2012 Michel Salim <salimma@fedoraproject.org> - 1.0.8-2
 - BR on texlive-latex for LaTeX tests