[blender/f17] Fix broken source file

[Jochen Schmitt]

commit c5f99ae4129f5e35000495fbf1c793c342ea0e8a
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sun Oct 28 17:04:05 2012 +0100

    Fix broken source file

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
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