4f9380 - omit conflicts with oxygen-icon-theme

Authored and Committed by rdieter 11 years ago
1 file changed. 7 lines added. 1 lines removed.
    - omit conflicts with oxygen-icon-theme
    
        
file modified
+7 -1