From e7935a9d7ce7333e158b4e7740f143e1016b55ea Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Sep 25 2016 01:29:32 +0000
Subject: Latest upstream update


---

diff --git a/sources b/sources
index 8ef11e9..23ecca6 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-a130a5a36d0ad2c93f1ecfef7dea208f  embree-2.10.0.tar.gz
-=======
 7b1ac18aad73ff57e80bed1042b38299  embree-2.11.0.tar.gz
->>>>>>> master