From d58d23698cc92c3b5b8a984ea4893ef9ad0b8fae Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dingyichen@gmail.com>
Date: Thu, 12 Jun 2014 17:27:31 +1000
Subject: [PATCH] Upstream Update to 0.4.0

---
 libchewing.spec | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libchewing.spec b/libchewing.spec
index 9cc8afc..9f40888 100644
--- a/libchewing.spec
+++ b/libchewing.spec
@@ -5,13 +5,8 @@
 %global name_zh_TW %{im_name_zh_TW}函式庫
 
 Name:           libchewing
-<<<<<<< HEAD
-Version:        0.3.5
-Release:        3%{?dist}
-=======
 Version:        0.4.0
 Release:        1%{?dist}
->>>>>>> Upstream Update to 0.4.0
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 Summary(zh_TW): %{name_zh_TW}
 
@@ -92,7 +87,6 @@ touch %{buildroot}%{libchewing_python_dir}/__init__.py
 
 rm -f %{buildroot}/%{_infodir}/dir
 
-
 %post
 /sbin/ldconfig
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :