75bac88 Remove some file conflicts (bug #967930)

Authored and Committed by jpopelka 10 years ago
    Remove some file conflicts (bug #967930)
    
        
file modified
+1 -0
file modified
+12 -7
file modified
+1 -1