5854ba8 Conflict in qt5-qtdeclarative-devel (#1441343), fix Release:

Authored and Committed by Rex Dieter 6 years ago
    Conflict in qt5-qtdeclarative-devel (#1441343), fix Release:
    
        
file modified
+18 -1