981a69c Fix merge artifact

Authored and Committed by sgrubb 5 years ago
    Fix merge artifact
    
        
file modified
+0 -1