From 5d19029aaa229f12775ffe430c98f7040df733dd Mon Sep 17 00:00:00 2001
From: Fedora <liangsuilong@gmail.com>
Date: Aug 07 2010 16:53:15 +0000
Subject: Upstream to 10.08.2 for fc14


---

diff --git a/ailurus.spec b/ailurus.spec
index f4f1fdc..6bd1efa 100644
--- a/ailurus.spec
+++ b/ailurus.spec
@@ -4,11 +4,7 @@
 %endif
 
 Name:			ailurus
-<<<<<<< HEAD
-Version:		10.08.1
-=======
 Version:		10.08.2
->>>>>>> master
 Release:		1%{?dist}
 Summary:		A simple application installer and GNOME tweaker
 Group:			Applications/System
@@ -79,12 +75,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python_sitelib}/ailurus*.egg-info
 
 %changelog
-<<<<<<< HEAD
-* Tue Aug 03 2010 Liang Suilong <liangsuilong@gmail.com> 10.08.1-1
-- Upstream to 10.08.1
-
-* Sun Aug 01 2010 Liang Suilong <liangsuilong@gmail.com> 10.07.8-2
-=======
 * Sat Aug 07 2010 Liang Suilong <liangsuilong@gmail.com> 10.08.2-1
 - Upstream to 10.08.2
 
@@ -92,7 +82,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - Upstream to 10.08.1
 
 * Sun Aug 1 2010 Liang Suilong <liangsuilong@gmail.com> 10.07.8-2
->>>>>>> master
 - Remove changelong in /usr/share/ailurus
 - Add some documents