[kdebase-runtime/f14/master] one more merge

[Rex Dieter]

commit a9cd279d81c47ae60c57f272c99360c08b87f05b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 12:32:17 2010 -0500

    one more merge

 kdebase-runtime.spec |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/kdebase-runtime.spec b/kdebase-runtime.spec
index b804cd9..adec434 100644
--- a/kdebase-runtime.spec
+++ b/kdebase-runtime.spec
@@ -116,10 +116,7 @@ BuildArch: noarch
 %patch3 -p1 -b .iconthemes-inherit
 #patch5 -p1 -b .manpath
 %patch6 -p1 -b .home_onlyshowin_kde
-<<<<<<< HEAD
-%patch100 -p1 -b .kioslave
-=======
->>>>>>> master
+
 
 %build
 mkdir -p %{_target_platform}