82c263b Fix up a bad merge

Authored and Committed by lkundrak 8 years ago
    Fix up a bad merge
    
        
file modified
+0 -35