- Source fix

This commit is contained in:
Helio Chissini de Castro 2015-12-10 22:17:14 +01:00
parent ef7a1f5cc1
commit 11803ab765

View File

@ -1,5 +1 @@
<<<<<<< HEAD
bd9779b99bc8031166b2972ee2f80b83 qtquickcontrols-opensource-src-5.6.0-beta.tar.gz bd9779b99bc8031166b2972ee2f80b83 qtquickcontrols-opensource-src-5.6.0-beta.tar.gz
=======
d3df94b69827f940f0f80f993db4b87c qtquickcontrols-opensource-src-5.6.0-beta1.tar.xz
>>>>>>> 268002b0616dfc5f3c6c3acbbd6229bef41e6766