dc9a143 bz#963547, fix file conflicts

Authored and Committed by than 11 years ago
    bz#963547, fix file conflicts
    
        
file modified
+9 -1