[kde-l10n/f14/master] Conflicts: kde-i18n < 1:3.5.10-14

[Rex Dieter]

commit b07150352ff4b856b74ed24d735f204579acddfb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Mar 22 07:04:00 2011 -0500

    Conflicts: kde-i18n < 1:3.5.10-14

 kde-l10n.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/kde-l10n.spec b/kde-l10n.spec
index b9dc89f..e59428c 100644
--- a/kde-l10n.spec
+++ b/kde-l10n.spec
@@ -7,7 +7,7 @@
 
 Name: kde-l10n
 Version: 4.6.1
-Release: 1%{dist}
+Release: 1%{dist}.1
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -1563,6 +1563,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Mar 22 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.1-1.1
+- Conflicts: kde-i18n < 1:3.5.10-14
+
 * Mon Feb 28 2011 Than Ngo <than at redhat.com> - 4.6.1-1
 - 4.6.1