rpms/highlight/devel highlight.spec,1.55,1.56

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/pkgs/rpms/highlight/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32709

Modified Files:
	highlight.spec 
Log Message:
Rmove conflict indicators


Index: highlight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- highlight.spec	10 Jun 2010 15:58:29 -0000	1.55
+++ highlight.spec	10 Jun 2010 15:59:39 -0000	1.56
@@ -34,12 +34,9 @@ Requires:	%{name} = %{version}-%{release
 A Qt-based GUI for the highlight source code formatter source.
 
 %prep
-<<<<<<< highlight.spec
+
 %setup -q -n %{name}-%{version}-beta
 %patch1 -p1 -b .org
-=======
-%setup -q
->>>>>>> 1.54
 
 # Provides: exclude perl(highlight_pipe) from example
 cat <<__EOF__ > %{name}-perl.prov