SPECS: texlive.spec - oops, garbage chunk removed

[sparky]

Author: sparky                       Date: Sat Apr 11 01:07:55 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- oops, garbage chunk removed

---- Files affected:
SPECS:
   texlive.spec (1.228 -> 1.229) 

---- Diffs:

================================================================
Index: SPECS/texlive.spec
diff -u SPECS/texlive.spec:1.228 SPECS/texlive.spec:1.229
--- SPECS/texlive.spec:1.228	Sat Apr 11 02:25:37 2009
+++ SPECS/texlive.spec	Sat Apr 11 03:07:49 2009
@@ -7958,10 +7958,6 @@
 %{texmf}/dvips/config
 %{texmf}/dvips/getafm
 %{texmf}/dvips/gsftopk
-<<<<<<< texlive.spec
-# %config(noreplace) %verify(not md5 mtime size) %{texmf}/dvips/config/config.ps
-=======
->>>>>>> 1.226
 %{texmfdist}/fonts/enc/dvips/base
 %{texmfdist}/fonts/map/dvips/allrunes
 %{texmfdist}/fonts/map/dvips/cmex/ttcmex.map
@@ -13826,6 +13822,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.229  2009/04/11 01:07:49  sparky
+- oops, garbage chunk removed
+
 Revision 1.228  2009/04/11 00:25:37  sparky
 - BR: texlive-xetex - needed for some xindy documentation
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/texlive.spec?r1=1.228&r2=1.229&f=u