[kdepim/f17] fix botched merge

[Rex Dieter]

commit af642aac8a02e8082d40dae94d263b6d0a54abc3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 8 12:05:27 2012 -0500

    fix botched merge

 .gitignore  |    6 ------
 kdepim.spec |   50 --------------------------------------------------
 sources     |    4 ----
 3 files changed, 0 insertions(+), 60 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f88f7f6..b5c01e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,2 @@
-<<<<<<< HEAD
-/kdepim-4.8.3.tar.xz
-/kdepim-4.8.4.tar.xz
-/kdepim-4.8.5.tar.xz
-=======
 /kdepim-4.8.5.tar.xz
 /kdepim-4.9.1.tar.xz
->>>>>>> master
diff --git a/kdepim.spec b/kdepim.spec
index 27b37b3..7f489d7 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -1,13 +1,8 @@
 Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   7
-<<<<<<< HEAD
-Version: 4.8.5
-Release: 4%{?dist}
-=======
 Version: 4.9.1
 Release: 1%{?dist}
->>>>>>> master
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -22,19 +17,7 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar
 # revert http://websvn.kde.org/?view=revision&revision=1072331 (rebased to 4.6)
 Patch0:  kdepim-4.5.85-install-headers.patch
 
-<<<<<<< HEAD
-# fix KMail migration (kde#283563)
-Patch2: kdepim-4.7.2-kmail-migration.patch
-
-## upstream patches
-# fix ktimetracker
-Patch100: changeset_rbb773366167af50fc99025473dc20ab5ab41e1cc.diff
-# https://projects.kde.org/projects/kde/kdepim/repository/revisions/628faec2651f6f20a438f61fc9c861c0d5eab0f8
-# "filtering removes email's content "https://bugs.kde.org/295484 
-Patch101: changeset_r628faec2651f6f20a438f61fc9c861c0d5eab0f8.diff
-=======
 ## upstream patches
->>>>>>> master
 
 Provides: kdepim4 = %{version}-%{release}
 
@@ -106,12 +89,6 @@ Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %setup -q -n kdepim-%{version}%{?pre}
 
 %patch0 -p1 -b .install-headers
-<<<<<<< HEAD
-%patch2 -p1 -b .kmail-migration
-%patch100 -p1 -b .ktimetracker
-%patch101 -p1 -b .filtering_removes_content
-=======
->>>>>>> master
 
 
 %build
@@ -230,32 +207,6 @@ fi
 
 
 %changelog
-<<<<<<< HEAD
-* Sat Aug 25 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.8.5-4
-- BR: prison-devel
-
-* Sat Aug 25 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.8.5-3
-- filtering removes email's content (kde#295484)
-
-* Fri Aug 17 2012 Lukas Tinkl <ltinkl at redhat.com> - 7:4.8.5-2
-- Resolves: #813257 - Ktimetracker shows only an empty window
-
-* Thu Aug 02 2012 Rex Dieter <rdieter at fedoraproject.org> - 7:4.8.5-1
-- 4.8.5
-
-* Mon Jul 09 2012 Rex Dieter <rdieter at fedoraproject.org> - 7:4.8.4-4
-- webkit security patch
-- QNetworkAccessHttpBackend crash fix
-
-* Fri Jul 06 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.8.4-3
-- upstream filtering patch
-
-* Thu Jun 07 2012 Lukáš Tinkl <ltinkl at redhat.com> - 6:4.8.4-2
-- respin
-
-* Mon Jun 04 2012 Than Ngo <than at redhat.com> - 7:4.8.4-1
-- 4.8.4
-=======
 * Mon Sep 03 2012 Than Ngo <than at redhat.com> - 7:4.9.1-1
 - 4.9.1
 
@@ -293,7 +244,6 @@ fi
 - 4.8.80
 - add locolor icons again
 - fix appsdir filelist
->>>>>>> master
 
 * Mon Apr 30 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.8.3-2
 - s/kdebase-runtime/kde-runtime/
diff --git a/sources b/sources
index 815c61d..bffddc6 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-74500f0fcc6441611d876a78d18ec68c  kdepim-4.8.5.tar.xz
-=======
 79d73b46fe53c19924657ecc01fe4729  kdepim-4.9.1.tar.xz
->>>>>>> master