packages: texlive/texlive.spec - delete cvs marks

[uzsolt]

Author: uzsolt                       Date: Wed Feb  9 23:25:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- delete cvs marks

---- Files affected:
packages/texlive:
   texlive.spec (1.331 -> 1.332) 

---- Diffs:

================================================================
Index: packages/texlive/texlive.spec
diff -u packages/texlive/texlive.spec:1.331 packages/texlive/texlive.spec:1.332
--- packages/texlive/texlive.spec:1.331	Thu Feb 10 00:20:32 2011
+++ packages/texlive/texlive.spec	Thu Feb 10 00:25:41 2011
@@ -328,8 +328,6 @@
 %description other-utils-doc -l pl.UTF-8
 Dokumentacja do narzędzi z pakietu %{name}-other-utils-doc.
 
-<<<<<<< texlive.spec
-=======
 %package doc
 Summary:	Documentation for TeX Live
 Summary(pl.UTF-8):	Dokumentacja do systemu TeX Live
@@ -583,7 +581,6 @@
 %description doc-zh_CN -l pl.UTF-8
 Przydatna chińska dokumentacja do systemu TeX Live.
 
->>>>>>> 1.330
 %package doc-latex
 Summary:	Basic LaTeX packages documentation
 Summary(hu.UTF-8):	Az alap LaTeX csomagok dokumentációja
@@ -3958,6 +3955,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.332  2011/02/09 23:25:41  uzsolt
+- delete cvs marks
+
 Revision 1.331  2011/02/09 23:20:32  uzsolt
 - cleaning
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/texlive/texlive.spec?r1=1.331&r2=1.332&f=u