9c52c11 design-suite: remove conflict text in ks

Authored and Committed by luya 9 years ago
    design-suite: remove conflict text in ks
    
        
file modified
+0 -3