b5922d8 Fix merge

Authored and Committed by jgrulich a year ago
    Fix merge
    
        
file modified
+0 -4