SPECS: kde4-kdepim.spec - kill conflicting file

[shadzik]

Author: shadzik                      Date: Thu Jul 17 21:35:44 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kill conflicting file

---- Files affected:
SPECS:
   kde4-kdepim.spec (1.62 -> 1.63) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdepim.spec
diff -u SPECS/kde4-kdepim.spec:1.62 SPECS/kde4-kdepim.spec:1.63
--- SPECS/kde4-kdepim.spec:1.62	Tue Jul 15 22:41:01 2008
+++ SPECS/kde4-kdepim.spec	Thu Jul 17 23:35:38 2008
@@ -973,7 +973,8 @@
 %{_iconsdir}/oxygen/*/actions/smallclock.png
 %{_iconsdir}/oxygen/*/actions/upindicator.png
 %{_iconsdir}/oxygen/*/actions/checkmark.png
-%{_iconsdir}/oxygen/*/actions/appointment-new.png
+# conflicts with kde-icons-oxygen
+#%{_iconsdir}/oxygen/*/actions/appointment-new.png
 %{_iconsdir}/oxygen/*/actions/journal-new.png
 %{_iconsdir}/oxygen/*/actions/task-new.png
 
@@ -1621,6 +1622,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2008/07/17 21:35:38  shadzik
+- kill conflicting file
+
 Revision 1.62  2008/07/15 20:41:01  shadzik
 - 4.0.98
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdepim.spec?r1=1.62&r2=1.63&f=u