s4504kr pushed to blender (f21). "Fix conflicts in sources"

[notifications at fedoraproject.org]

>From a89196c560ad2393edef3bbe035bc31e52a39b47 Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Sun, 5 Apr 2015 19:17:10 +0200
Subject: Fix conflicts in sources


diff --git a/sources b/sources
index 045c07c..5c53f0d 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-8e546e622c6dfc1f0231636270bdf8de  blender-2.73.tar.gz
-=======
 488151953d69d63bedd8ed59f92daf3b  blender-2.74.tar.gz
->>>>>>> ab7341e... New upstream release
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/blender.git/commit/?h=f21&id=a89196c560ad2393edef3bbe035bc31e52a39b47