From 11803ab765a441d31e5bec7b3da31828255a1918 Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio@kde.org>
Date: Thu, 10 Dec 2015 22:17:14 +0100
Subject: [PATCH] - Source fix

---
 sources | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sources b/sources
index 79aa9fc..30500ef 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
 bd9779b99bc8031166b2972ee2f80b83  qtquickcontrols-opensource-src-5.6.0-beta.tar.gz
-=======
-d3df94b69827f940f0f80f993db4b87c  qtquickcontrols-opensource-src-5.6.0-beta1.tar.xz
->>>>>>> 268002b0616dfc5f3c6c3acbbd6229bef41e6766