5cf1646 fixed f18 rebuild merge conflict

Merged and Committed by Ross Delinger 11 years ago
    fixed f18 rebuild merge conflict
    
        
file modified
+2 -1