[koffice/f15] finish merge

[Rex Dieter]

commit e56e54403616cde7822120e44b136a6adc1db935
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 23 15:51:35 2011 -0500

    finish merge

 koffice.spec |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/koffice.spec b/koffice.spec
index 3a16116..2a44f18 100644
--- a/koffice.spec
+++ b/koffice.spec
@@ -1219,8 +1219,6 @@ fi
 
 
 %changelog
-<<<<<<< HEAD
-=======
 * Fri Sep 23 2011 Rex Dieter <rdieter at fedoraproject.org> 3:2.3.3-12
 - upstream fix-form-color-properties-2.3.patch
 - upstream fix-crash-in-kexidb-queries-2.3.patch