From 13ae359249f8fa320bde09428121bff44fed1aa5 Mon Sep 17 00:00:00 2001
From: Zdenek Prikryl <zprikryl@fedoraproject.org>
Date: Aug 20 2009 07:38:00 +0000
Subject: removed conflict indicator


---

diff --git a/bc.spec b/bc.spec
index 0294c8f..374c61b 100644
--- a/bc.spec
+++ b/bc.spec
@@ -71,7 +71,6 @@ fi
 %{_infodir}/*
 
 %changelog
-<<<<<<< bc.spec
 * Thu Aug 20 2009 Zdenek Prikryl <zprikryl@redhat.com> 1.06-36
 - Don't complain if installing with --excludedocs (#515934)