rpms/mythtv-themes/devel mythtv-themes.spec,1.9,1.10

[Jarod Wilson]

Author: jarod

Update of /cvs/free/rpms/mythtv-themes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2805

Modified Files:
	mythtv-themes.spec 
Log Message:
stupid cvs merge...


Index: mythtv-themes.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/devel/mythtv-themes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mythtv-themes.spec	7 Apr 2009 23:22:39 -0000	1.9
+++ mythtv-themes.spec	7 Apr 2009 23:23:28 -0000	1.10
@@ -111,7 +111,6 @@
 %{_datadir}/mythtv/themes/*
 
 %changelog
-<<<<<<< mythtv-themes.spec
 * Tue Apr 07 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.2.svn.r20317
 - Update to pre-0.22 svn trunk, rev 20317