1c021aa add conflicts wallpapoz (bz 1029554)

Authored and Committed by leigh123linux 10 years ago
    add conflicts wallpapoz (bz 1029554)
    
        
file modified
+8 -1