From c5f99ae4129f5e35000495fbf1c793c342ea0e8a Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <Jochen@herr-schmitt.de>
Date: Oct 28 2012 16:04:05 +0000
Subject: Fix broken source file


---

diff --git a/sources b/sources
index 542b9a2..4fab698 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-31a60b3ce5466d965cb7e2648995e092  blender-2.63a.tar.gz
-=======
 227627840e373914e3b92043925597cb  blender-2.64a.tar.gz
->>>>>>> master