From 0e325c007cafce0c9083a4b42d50eb20776557be Mon Sep 17 00:00:00 2001
From: Fedora <fedora@fedora-desktop.(none)>
Date: Thu, 7 Jun 2012 01:32:48 +0800
Subject: [PATCH] Fix SPEC Error

---
 fcitx.spec | 1 -
 1 file changed, 1 deletion(-)

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@gmail.com> - 4.2.4-2.1
 - Disable GIR Binding on Fedora 16