[sunpinyin] Fix the spec

[Liang Suilong]

commit f95fe7d2b01acbd56f2d878a3bf8eba73eab04a8
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Thu Jul 26 00:14:46 2012 +0800

    Fix the spec

 sunpinyin.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/sunpinyin.spec b/sunpinyin.spec
index 12fbde3..65abfba 100644
--- a/sunpinyin.spec
+++ b/sunpinyin.spec
@@ -198,7 +198,6 @@ fi
 %config %{_xinputconf}
 
 %changelog
-<<<<<<< HEAD
 * Thu Jul 26 2012 Liang Suilong <liangsuilong at gmail.com> - 2.0.4-0.4
 - Upstream to the latest git snapshot