9ebd0b9 resolve another commit conflict

Authored and Committed by John Heidemann 4 years ago
    resolve another commit conflict
    
        
file modified
+0 -4