c3583a4 - omit kate.png conflicts (w/kdesdk42)

Authored and Committed by rdieter 15 years ago
    - omit kate.png conflicts (w/kdesdk42)
    
        
file modified
+5 -1