removed conflict indicator

2009-08-20 07:38:00 +00:00 · 2009-08-20 07:38:00 +00:00 · 13ae359249
commit 13ae359249
parent 6163ef1354
1 changed files with 0 additions and 1 deletions
--- 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)