cfa7c6b fix conflicts

Merged and Committed by leigh123linux 10 years ago
    fix conflicts
    
        
file modified
+10 -1