acac74 Fix merge conflict

Authored and Committed by mharris 13 years ago
    Fix merge conflict
    
        
file modified
+0 -2