[fcitx/f16] Fix SPEC Error

[Liang Suilong]

commit 0e325c007cafce0c9083a4b42d50eb20776557be
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Thu Jun 7 01:32:48 2012 +0800

    Fix SPEC Error

 fcitx.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/fcitx.spec b/fcitx.spec
index fd7b470..cb96d96 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -305,7 +305,6 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 
 
 %changelog
-<<<<<<< HEAD
 * Thu Jun 07 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.4-2.1
 - Disable GIR Binding on Fedora 16