4f02067 fix rpm file conflict

Authored and Committed by than 19 years ago
1 file changed. 9 lines added. 19 lines removed.
    fix rpm file conflict
    
        
file modified
+9 -19