rpms/bc/devel bc.spec,1.42,1.43

[Zdenek Prikryl]

Author: zprikryl

Update of /cvs/extras/rpms/bc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv582

Modified Files:
	bc.spec 
Log Message:
removed conflict indicator



Index: bc.spec
===================================================================
RCS file: /cvs/extras/rpms/bc/devel/bc.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- bc.spec	20 Aug 2009 07:37:28 -0000	1.42
+++ bc.spec	20 Aug 2009 07:38:00 -0000	1.43
@@ -71,7 +71,6 @@ fi
 %{_infodir}/*
 
 %changelog
-<<<<<<< bc.spec
 * Thu Aug 20 2009 Zdenek Prikryl <zprikryl at redhat.com> 1.06-36
 - Don't complain if installing with --excludedocs (#515934)