From fd8a8cbccd78dfb8711d698b421e4e068104be0c Mon Sep 17 00:00:00 2001
From: James Ni <kent.neo@gmail.com>
Date: Jul 24 2012 14:58:18 +0000
Subject: Merge upstream


---

diff --git a/fonts-tweak-tool.spec b/fonts-tweak-tool.spec
index 1b88c46..49275b8 100644
--- a/fonts-tweak-tool.spec
+++ b/fonts-tweak-tool.spec
@@ -1,11 +1,6 @@
 Name: fonts-tweak-tool
-<<<<<<< HEAD
 Version: 0.0.7
 Release: 1%{?dist}
-=======
-Version: 0.0.6
-Release: 2%{?dist}
->>>>>>> db70531c7023de4dd5002e9fe961f3b11de4467b
 Summary: Tool for customizing fonts per language
 
 Group: User Interface/Desktops