a45e3f3 adjust icon conflict resolution

Authored and Committed by rdieter 12 years ago
1 file changed. 7 lines added. 10 lines removed.
    adjust icon conflict resolution
    
        
file modified
+7 -10