e2e75b0 fix merge

Authored and Committed by leigh123linux 7 years ago
    fix merge
    
        
file modified
+2 -5