04f7d5c resolve merge conflict vs f30

Authored and Committed by caolanm 5 years ago
    resolve merge conflict vs f30
    
        
file modified
+5 -2