[fcitx/f16] Fix changelog

[Liang Suilong]

commit 31686c25945977500ea4c0627e726ee1cf2c1777
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Tue Jul 24 23:28:21 2012 +0800

    Fix changelog

 fcitx.spec |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/fcitx.spec b/fcitx.spec
index 90b1869..4755cfc 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -312,14 +312,11 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 * Sun Jul 22 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.5-1
 - Upstream to fcitx-4.2.5
 
-* Thu Jun 07 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.4-2.1
-- Disable GIR Binding on Fedora 16
-
-- Upstream to fcitx-4.2.5
-
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
->>>>>>> master
+
+* Thu Jun 07 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.4-2.1
+- Disable GIR Binding on Fedora 16
 
 * Thu Jun 07 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.4-2
 - Drop fcitx-keyboard