From a5604dd8dfdca782408ba7287ee0d71f05687cf1 Mon Sep 17 00:00:00 2001
From: Fedora <liangsuilong@gmail.com>
Date: Sun, 8 Aug 2010 02:25:15 +0800
Subject: [PATCH] Edit source file

---
 sources | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sources b/sources
index c722057..68d170f 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-ddfc680c3693e1ba1ab250ef0b9fe59f  ailurus-10.08.1.tar.gz
-=======
 257722fd90fec2100124e7505914cb98  ailurus-10.08.2.tar.gz
->>>>>>> master
+